[jboss-cvs] JBossAS SVN: r111130 - projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge.

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

Author: maeste
Date: 2011-04-08 08:21:01 -0400 (Fri, 08 Apr 2011)
New Revision: 111130

Modified:
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java
Log:
 fixing NPE

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java	2011-04-08 01:37:43 UTC (rev 111129)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java	2011-04-08 12:21:01 UTC (rev 111130)
@@ -206,12 +206,18 @@
                ConnectionDefinition newConDef = conDef;
                if (ij.getConnectionDefinitions() != null)
                {
-
-                  for (CommonConnDef commonConDef : ij.getConnectionDefinitions())
+                  if (ij.getConnectionDefinitions().size() == 1)
                   {
-                     if (connDefMatcher.match(conDef, commonConDef))
+                     newConDef = mergeConDef(ij.getConnectionDefinitions().get(0), newConDef);
+                  }
+                  else
+                  {
+                     for (CommonConnDef commonConDef : ij.getConnectionDefinitions())
                      {
-                        newConDef = mergeConDef(commonConDef, newConDef);
+                        if (connDefMatcher.match(conDef, commonConDef))
+                        {
+                           newConDef = mergeConDef(commonConDef, newConDef);
+                        }
                      }
                   }
                }