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

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

Author: ALRubinger
Date: 2008-02-27 03:10:44 -0500 (Wed, 27 Feb 2008)
New Revision: 70161

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java
Log:
Reordered @EJB and XML ejb-ref dependency handling such that true dependencies are added before falling back on a JNDI dependency (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-02-27 07:48:48 UTC (rev 70160)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java	2008-02-27 08:10:44 UTC (rev 70161)
@@ -120,12 +120,6 @@
    {
       if(mappedName != null && mappedName.length() == 0) mappedName = null;
       if (refClass != null && (refClass.equals(Object.class) || refClass.equals(void.class))) refClass = null;
-
-      if(mappedName != null)
-      {
-         addJNDIDependency(container, mappedName);
-         return;
-      }
       
       if (refClass != null)
       {
@@ -138,6 +132,11 @@
             addDependency(container, refClass);
          }
       }
+      else if(mappedName != null)
+      {
+         addJNDIDependency(container, mappedName);
+         return;
+      }
       else
       {
          String msg = "IGNORING DEPENDENCY: unable to resolve dependency of EJB, there is too little information";