geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: rev 51817 - geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector
Date Sun, 03 Oct 2004 01:09:43 GMT
Author: ammulder
Date: Sat Oct  2 18:09:42 2004
New Revision: 51817

Modified:
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ActivationSpecWrapper.java
Log:
Fix Jira bug GERONIMO-349: allow ResourceAdapter.getXAResources
  to return null


Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ActivationSpecWrapper.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ActivationSpecWrapper.java
(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/ActivationSpecWrapper.java
Sat Oct  2 18:09:42 2004
@@ -156,7 +156,7 @@
         }
         try {
             XAResource[] xaResources = resourceAdapterWrapper.getXAResources(new ActivationSpec[]{activationSpec});
-            if (xaResources.length == 0) {
+            if (xaResources == null || xaResources.length == 0) {
                 return null;
             }
             return new WrapperNamedXAResource(xaResources[0], containerId);

Mime
View raw message