[jboss-cvs] JBossAS SVN: r66374 - 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 03:04:15 -0400 (Wed, 24 Oct 2007)
New Revision: 66374

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
Log:
Fix the invoker proxy bindings merge

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:48:21 UTC (rev 66373)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2007-10-24 07:04:15 UTC (rev 66374)
@@ -592,7 +592,7 @@
          containerConfigurations = new ContainerConfigurationsMetaData();
       if(override != null && override.containerConfigurations != null)
          containerConfigurations.merge(override.containerConfigurations);
-      if(this.invokerProxyBindings != null)
+      if(this.invokerProxyBindings == null)
          invokerProxyBindings = new InvokerProxyBindingsMetaData();
       if(override != null && override.invokerProxyBindings != null)
          invokerProxyBindings.merge(override.invokerProxyBindings);