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

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

Author: scott.stark at jboss.org
Date: 2007-10-22 17:18:04 -0400 (Mon, 22 Oct 2007)
New Revision: 66342

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationsMetaData.java
Log:
Update merge logic

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationsMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationsMetaData.java	2007-10-22 21:03:51 UTC (rev 66341)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationsMetaData.java	2007-10-22 21:18:04 UTC (rev 66342)
@@ -27,7 +27,7 @@
  * MessageDestinationsMetaData.
  * 
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision$
  */
 public class MessageDestinationsMetaData extends AbstractMappedMetaData<MessageDestinationMetaData>
 {
@@ -42,19 +42,27 @@
       super("message destination name");
    }
 
-   public void merge(MessageDestinationsMetaData merged, MessageDestinationsMetaData original)
+   /**
+    * Merge the contents of override with original into this.
+    * 
+    * @param override data which overrides original
+    * @param original the original data
+    */
+   public void merge(MessageDestinationsMetaData override, MessageDestinationsMetaData original)
    {
-      if(original == null || original.size() == 0)
-         merged.addAll(this);
-      else
+      if(original == null && override != null)
+         addAll(override);
+      else if(override != null)
       {
-         for(MessageDestinationMetaData md : this)
+         for(MessageDestinationMetaData md : override)
          {
             MessageDestinationMetaData mergedMD = new MessageDestinationMetaData();
             MessageDestinationMetaData mdOrig = original.get(md.getMessageDestinationName());
             if(mdOrig != null)
-               md.merge(mergedMD, mdOrig);
+               mergedMD.merge(md, mdOrig);
          }
       }
+      else
+         addAll(original);
    }
 }


Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/spec/MessageDestinationsMetaData.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision