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

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

Author: thomas.diesler at jboss.com
Date: 2007-10-30 18:21:08 -0400 (Tue, 30 Oct 2007)
New Revision: 66583

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java
Log:
[JBAS-4915] service-ref merge looses data

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-30 21:48:56 UTC (rev 66582)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferencesMetaData.java	2007-10-30 22:21:08 UTC (rev 66583)
@@ -21,10 +21,10 @@
  */
 package org.jboss.metadata.javaee.jboss;
 
+// $Id$
+
 import javax.xml.bind.annotation.XmlType;
 
-import org.jboss.metadata.javaee.spec.EJBLocalReferencesMetaData;
-import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
 import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
 import org.jboss.metadata.javaee.support.JavaEEMetaDataUtil;
 
@@ -33,9 +33,8 @@
  * @author Scott.Stark at jboss.org
  * @version $Revision$
  */
- at XmlType(name="service-refType")
-public class JBossServiceReferencesMetaData
-   extends ServiceReferencesMetaData
+ at XmlType(name = "service-refType")
+public class JBossServiceReferencesMetaData extends ServiceReferencesMetaData
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = 1;
@@ -46,6 +45,7 @@
    public JBossServiceReferencesMetaData()
    {
    }
+
    /**
     * Merge resource references
     * 
@@ -55,15 +55,19 @@
     * @param overrideFile the override file
     * @return the merged referencees
     */
-   public static JBossServiceReferencesMetaData merge(ServiceReferencesMetaData override,
-         ServiceReferencesMetaData overriden,
-         String overridenFile, String overrideFile)
+   public static JBossServiceReferencesMetaData merge(ServiceReferencesMetaData override, ServiceReferencesMetaData overriden, String overridenFile, String overrideFile)
    {
       if (override == null && overriden == null)
          return null;
 
       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;
    }