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

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

Author: alex.loubyansky at jboss.com
Date: 2008-06-03 09:52:08 -0400 (Tue, 03 Jun 2008)
New Revision: 73996

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java
Log:
JBMETA-48

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java	2008-06-03 13:08:50 UTC (rev 73995)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossServiceBeanMetaData.java	2008-06-03 13:52:08 UTC (rev 73996)
@@ -101,4 +101,35 @@
    {
       this.xmBean = xmBean;
    }
+   
+   public void merge(JBossEnterpriseBeanMetaData overrideEjb, JBossEnterpriseBeanMetaData originalEjb)
+   {
+      super.merge(overrideEjb, originalEjb);
+      JBossServiceBeanMetaData override = (JBossServiceBeanMetaData) overrideEjb;
+      JBossServiceBeanMetaData original = (JBossServiceBeanMetaData) originalEjb;
+      
+      if(original != null)
+      {
+         if(original.localJndiName != null)
+            localJndiName = original.localJndiName;
+         if(original.management != null)
+            management = original.management;
+         if(original.objectName != null)
+            objectName = original.objectName;
+         if(original.xmBean != null)
+            xmBean = original.xmBean;
+      }
+      
+      if(override != null)
+      {
+         if(override.localJndiName != null)
+            localJndiName = override.localJndiName;
+         if (override.management != null)
+            management = override.management;
+         if (override.objectName != null)
+            objectName = override.objectName;
+         if (override.xmBean != null)
+            xmBean = override.xmBean;
+      }
+   }
 }