You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2010/08/19 16:44:48 UTC
svn commit: r987165 -
/geronimo/components/txmanager/trunk/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecNamedXAResourceFactory.java
Author: kevan
Date: Thu Aug 19 14:44:48 2010
New Revision: 987165
URL: http://svn.apache.org/viewvc?rev=987165&view=rev
Log:
GERONIMO-5152 fix potential NPE, if a null xaResource is returned
Modified:
geronimo/components/txmanager/trunk/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecNamedXAResourceFactory.java
Modified: geronimo/components/txmanager/trunk/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecNamedXAResourceFactory.java
URL: http://svn.apache.org/viewvc/geronimo/components/txmanager/trunk/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecNamedXAResourceFactory.java?rev=987165&r1=987164&r2=987165&view=diff
==============================================================================
--- geronimo/components/txmanager/trunk/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecNamedXAResourceFactory.java (original)
+++ geronimo/components/txmanager/trunk/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecNamedXAResourceFactory.java Thu Aug 19 14:44:48 2010
@@ -51,7 +51,7 @@ public class ActivationSpecNamedXAResour
public NamedXAResource getNamedXAResource() throws SystemException {
try {
XAResource[] xaResources = resourceAdapter.getXAResources(new ActivationSpec[]{activationSpec});
- if (xaResources == null || xaResources.length == 0) {
+ if (xaResources == null || xaResources.length == 0 || xaResources[0] == null) {
return null;
}
return new WrapperNamedXAResource(xaResources[0], name);