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

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

Author: wolfc
Date: 2008-05-02 13:45:41 -0400 (Fri, 02 May 2008)
New Revision: 73028

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java
Log:
EJBTHREE-1289: check for NPE and assertion on 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-05-02 17:09:49 UTC (rev 73027)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java	2008-05-02 17:45:41 UTC (rev 73028)
@@ -157,6 +157,8 @@
          refClass = null;
       if (mappedName != null && mappedName.trim().equals(""))
          mappedName = null;
+      
+      // mappedName can be null, because an annotation has not been augmented with resolvedJndiName
       if (mappedName == null)
       {
          //
@@ -164,7 +166,7 @@
          if(amds != null)
          {
             AnnotatedEJBReferenceMetaData amd = amds.get(encName);
-            if(amd == null)
+            if(amd == null && fieldName != null)
                amd = amds.get(fieldName);
             if(amd != null)
             {
@@ -175,10 +177,15 @@
          }
       }
 
+      // The MappedDeploymentEndpointResolver should have put resolvedJndiName everywhere.
+      // If no mappedName is know by now, we have a bug.
+      assert mappedName == null : "mappedName for enc " + encName + " is null (container.environmentRefGroup.annotatedEjbReferences = " + container.getEnvironmentRefGroup().getAnnotatedEjbReferences() + ")";
+      
       EncInjector injector = null;
       
       if (mappedName == null)
       {
+         // legacy
          injector = new EjbEncInjector(encName, refClass, link, errorType);
       }
       else