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

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

Author: scott.stark at jboss.org
Date: 2008-05-01 19:02:29 -0400 (Thu, 01 May 2008)
New Revision: 72963

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
Log:
JBMETA-31, fix the legacy msg-ref/resource-ref merging

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java	2008-05-01 22:02:58 UTC (rev 72962)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/jboss/JBossClientMetaData.java	2008-05-01 23:02:29 UTC (rev 72963)
@@ -477,6 +477,11 @@
             }
             if(msgRefs.contains(ref) == false)
                msgRefs.add(ref);
+            else
+            {
+               MessageDestinationReferenceMetaData existingRef = msgRefs.get(ref.getMessageDestinationRefName());
+               existingRef.merge(null, ref);
+            }
          }
 
          // Merge the spec resource-env-refs
@@ -493,11 +498,13 @@
                {
                   for(MessageDestinationReferenceMetaData mref : linkedRefs)
                   {
-                     if(mref.getIgnoreDependency() != null)
+                     // Need to make sure this is the ref in the map
+                     MessageDestinationReferenceMetaData existingRef = msgRefs.get(mref.getMessageDestinationRefName());
+                     if(existingRef.getIgnoreDependency() != null)
                         ref.setIgnoreDependency(mref.getIgnoreDependency());
-                     if(mref.getType() != null)
+                     if(existingRef.getType() != null)
                         ref.setType(mref.getType());
-                     mref.setMappedName(ref.getMappedName());
+                     existingRef.setMappedName(ref.getMappedName());
                   }
                }
                else if(msgRefs.containsKey(resRefName))