[jboss-cvs] JBossAS SVN: r67166 - in projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee: support and 1 other directory.

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

Author: wolfc
Date: 2007-11-16 05:25:28 -0500 (Fri, 16 Nov 2007)
New Revision: 67166

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/JavaEEMetaDataUtil.java
Log:
JBAS-4506: Fixed regression on MetaDataRepositoryUnitTestCase.testAnnotationMetaData

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java	2007-11-16 08:56:21 UTC (rev 67165)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java	2007-11-16 10:25:28 UTC (rev 67166)
@@ -60,6 +60,8 @@
       if (override == null && overriden == null)
          return null;
 
+      // TODO: if overriden is empty, it's silly to do a merge
+      
       JBossServiceReferencesMetaData merged = new JBossServiceReferencesMetaData();
       JavaEEMetaDataUtil.merge(merged, overriden, override, "service-ref", overridenFile, overrideFile, false);
       return 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-11-16 08:56:21 UTC (rev 67165)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/JavaEEMetaDataUtil.java	2007-11-16 10:25:28 UTC (rev 67166)
@@ -76,6 +76,11 @@
       // No override
       if (overriden == null || overriden.isEmpty())
       {
+         // There are no overrides and no overriden
+         // TODO: it has been really silly to call upon merge, but allas
+         if (mapped == null)
+            return merged;
+         
          if (mapped.isEmpty() == false && mustOverride)
             throw new IllegalStateException(overridenFile + " has no " + context + "s but " + overrideFile + " has " + mapped.keySet());
          if(mapped != merged)