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

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

Author: wolfc
Date: 2007-09-20 12:37:01 -0400 (Thu, 20 Sep 2007)
New Revision: 65506

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/ResourceInjectionMetaDataWithDescriptions.java
Log:
Fixed merge

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/ResourceInjectionMetaDataWithDescriptions.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/ResourceInjectionMetaDataWithDescriptions.java	2007-09-20 16:36:44 UTC (rev 65505)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/support/ResourceInjectionMetaDataWithDescriptions.java	2007-09-20 16:37:01 UTC (rev 65506)
@@ -66,4 +66,13 @@
          throw new IllegalArgumentException("Null descriptions");
       this.descriptions = descriptions;
    }
+   
+   public void merge(ResourceInjectionMetaDataWithDescriptions merged, ResourceInjectionMetaDataWithDescriptions original)
+   {
+      super.merge(merged, original);
+      if(descriptions != null)
+         merged.setDescriptions(descriptions);
+      else if(original.descriptions != null)
+         merged.setDescriptions(original.descriptions);
+   }
 }