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

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

Author: ALRubinger
Date: 2008-02-28 15:31:53 -0500 (Thu, 28 Feb 2008)
New Revision: 70227

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java
Log:
Reverted ordering of dependency handling

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-28 19:45:31 UTC (rev 70226)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java	2008-02-28 20:31:53 UTC (rev 70227)
@@ -121,6 +121,12 @@
       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)
       {
          if (link != null && !link.trim().equals(""))
@@ -132,11 +138,7 @@
             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";