[jboss-cvs] JBossAS SVN: r111511 - projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2011-06-02 11:03:13 -0400 (Thu, 02 Jun 2011)
New Revision: 111511

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
Log:
If there are no CFs or no AOs - dont set reference

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-06-02 14:43:29 UTC (rev 111510)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-06-02 15:03:13 UTC (rev 111511)
@@ -1740,10 +1740,10 @@
             log.debug("Activated: " + url.toExternalForm());
          }
 
-         Object[] aoObjs = aos.toArray(new Object[aos.size()]);
-         String[] aoJndis = aoJndiNames.toArray(new String[aoJndiNames.size()]);
-         Object[] cfObjs = cfs.toArray(new Object[cfs.size()]);
-         String[] cfJndis = cfJndiNames.toArray(new String[cfJndiNames.size()]);
+         Object[] cfObjs = cfs.size() > 0 ? cfs.toArray(new Object[cfs.size()]) : null;
+         String[] cfJndis = cfJndiNames.size() > 0 ? cfJndiNames.toArray(new String[cfJndiNames.size()]) : null;
+         Object[] aoObjs = aos.size() > 0 ? aos.toArray(new Object[aos.size()]) : null;
+         String[] aoJndis = aoJndiNames.size() > 0 ? aoJndiNames.toArray(new String[aoJndiNames.size()]) : null;
          
          return new CommonDeployment(url, deploymentName, activateDeployment,
                                      resourceAdapter, resourceAdapterKey,