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

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

Author: bdecoste
Date: 2008-03-04 17:15:46 -0500 (Tue, 04 Mar 2008)
New Revision: 70378

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java
Log:
workaround for AbstractEJBReferenceMetaData reporting mappedName = link when there is no 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-03-04 22:08:52 UTC (rev 70377)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java	2008-03-04 22:15:46 UTC (rev 70378)
@@ -77,10 +77,15 @@
          return;
 
       String mappedName = ref.getMappedName();
+     
       if (mappedName != null && mappedName.equals("")) mappedName = null;
 
       String link = ref.getLink();
       if (link != null && link.trim().equals("")) link = null;
+      
+      // AbstractEJBReferenceMetaData reports mappedName = link when there is no mappedName
+      if (mappedName != null && link != null && mappedName.equals(link))
+         mappedName = null;
 
       Class<?> refClass = null;
 
@@ -152,7 +157,7 @@
       if (mappedName != null && mappedName.trim().equals("")) mappedName = null;
 
       EncInjector injector = null;
-
+      
       if (mappedName == null)
       {
          injector = new EjbEncInjector(encName, refClass, link, errorType);