[jboss-cvs] JBossAS SVN: r76952 - trunk/server/src/main/org/jboss/deployment.

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

Author: ALRubinger
Date: 2008-08-11 14:45:26 -0400 (Mon, 11 Aug 2008)
New Revision: 76952

Modified:
   trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
Log:
[EJBTHREE-1455] Resolve EJB Local Refs to interface-specific Proxy addresses, not the default local

Modified: trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-08-11 17:39:47 UTC (rev 76951)
+++ trunk/server/src/main/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java	2008-08-11 18:45:26 UTC (rev 76952)
@@ -46,6 +46,7 @@
 import org.jboss.metadata.ejb.jboss.JBossGenericBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
+import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.JBossSessionPolicyDecorator;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DeploymentSummary;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.EjbDeploymentSummary;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.KnownInterfaces;
@@ -799,7 +800,7 @@
                String ifaceName = iface != null ? iface.getName() : null;
                
                //LegacyEjb3JndiPolicy policy = new LegacyEjb3JndiPolicy();
-               String containerJndiName = target.getBeanMetaData().determineResolvedJndiName(ifaceName);
+               String containerJndiName = target.getBeanMetaData().determineResolvedJndiName(ifaceName);               
                if(containerJndiName != null)
                   ref.setResolvedJndiName(containerJndiName);
             }
@@ -883,7 +884,8 @@
             {
                cdmd.addDependency(target);
                // Need to look at the local jndi name
-               String localJndiName = target.getBeanMetaData().determineLocalJndiName();
+               String localInterface = ref.getLocal();
+               String localJndiName = target.getBeanMetaData().determineResolvedJndiName(localInterface);
                if(localJndiName != null)
                   ref.setResolvedJndiName(localJndiName);
             }