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

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

Author: scott.stark at jboss.org
Date: 2007-10-30 23:58:12 -0400 (Tue, 30 Oct 2007)
New Revision: 66593

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java
Log:
Remove the 4915 workaround

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-10-31 03:52:18 UTC (rev 66592)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java	2007-10-31 03:58:12 UTC (rev 66593)
@@ -62,12 +62,6 @@
 
       JBossServiceReferencesMetaData merged = new JBossServiceReferencesMetaData();
       JavaEEMetaDataUtil.merge(merged, overriden, override, "service-ref", overridenFile, overrideFile, false);
-      
-      // [JBAS-4915] service-ref merge looses data
-      // Should this be handled generally in JavaEEMetaDataUtil.merge() ?
-      if (overriden == null && override instanceof JBossServiceReferencesMetaData)
-         merged = (JBossServiceReferencesMetaData)override;
-
       return merged;
    }