[jboss-cvs] JBossAS SVN: r66594 - projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support.

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

Author: scott.stark at jboss.org
Date: 2007-10-31 02:17:35 -0400 (Wed, 31 Oct 2007)
New Revision: 66594

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/JavaEEMetaDataUtil.java
Log:
Only call merged.addAll(mapped) if mapped != merged

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/JavaEEMetaDataUtil.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/JavaEEMetaDataUtil.java	2007-10-31 03:58:12 UTC (rev 66593)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/JavaEEMetaDataUtil.java	2007-10-31 06:17:35 UTC (rev 66594)
@@ -78,7 +78,8 @@
       {
          if (mapped.isEmpty() == false && mustOverride)
             throw new IllegalStateException(overridenFile + " has no " + context + "s but " + overrideFile + " has " + mapped.keySet());
-         merged.addAll(mapped);
+         if(mapped != merged)
+            merged.addAll(mapped);
          return merged;
       }