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

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

Author: scott.stark at jboss.org
Date: 2007-10-24 02:48:21 -0400 (Wed, 24 Oct 2007)
New Revision: 66373

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
Log:
Merge the relationships

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2007-10-24 06:33:07 UTC (rev 66372)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2007-10-24 06:48:21 UTC (rev 66373)
@@ -600,7 +600,11 @@
          webservices = new WebservicesMetaData();
 
       if(original != null)
+      {
          this.ejbVersion = original.getVersion();
+         this.relationships = original.getRelationships();
+      }
+
       if(override != null && override.assemblyDescriptor != null)
       {
          assemblyDescriptor.merge(override.assemblyDescriptor, original.getAssemblyDescriptor());