[jboss-cvs] JBossAS SVN: r72269 - projects/ejb3/trunk/core/src/main/java/org/jboss/injection.

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

Author: scott.stark at jboss.org
Date: 2008-04-16 05:31:32 -0400 (Wed, 16 Apr 2008)
New Revision: 72269

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java
Log:
EJBTHREE-1289, look to resolvedJndiName for the mappedName

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java	2008-04-16 09:30:08 UTC (rev 72268)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java	2008-04-16 09:31:32 UTC (rev 72269)
@@ -77,8 +77,11 @@
          return;
 
       String mappedName = ref.getMappedName();
-     
-      if (mappedName != null && mappedName.equals("")) mappedName = null;
+      if (mappedName != null && mappedName.equals(""))
+         mappedName = null;
+      // See if the name has been resolved externally
+      if(mappedName == null && ref.getResolvedJndiName() != null)
+         mappedName = ref.getResolvedJndiName();
 
       String link = ref.getLink();
       if (link != null && link.trim().equals("")) link = null;