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

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

Author: wolfc
Date: 2008-04-21 09:04:00 -0400 (Mon, 21 Apr 2008)
New Revision: 72489

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java
Log:
Fixed NPE

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-21 12:52:16 UTC (rev 72488)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java	2008-04-21 13:04:00 UTC (rev 72489)
@@ -161,14 +161,17 @@
       {
          //
          AnnotatedEJBReferencesMetaData amds = container.getEnvironmentRefGroup().getAnnotatedEjbReferences();
-         AnnotatedEJBReferenceMetaData amd = amds.get(encName);
-         if(amd == null)
-            amd = amds.get(fieldName);
-         if(amd != null)
+         if(amds != null)
          {
-            mappedName = amd.getMappedName();
-            if(mappedName == null)
-               mappedName = amd.getResolvedJndiName();
+            AnnotatedEJBReferenceMetaData amd = amds.get(encName);
+            if(amd == null)
+               amd = amds.get(fieldName);
+            if(amd != null)
+            {
+               mappedName = amd.getMappedName();
+               if(mappedName == null)
+                  mappedName = amd.getResolvedJndiName();
+            }
          }
       }