[jboss-cvs] JBossAS SVN: r72410 - trunk/ejb3/src/main/org/jboss/ejb3/clientmodule.

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

Author: scott.stark at jboss.org
Date: 2008-04-17 22:55:09 -0400 (Thu, 17 Apr 2008)
New Revision: 72410

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/EJBRemoteHandler.java
Log:
Handle null annotated ejb reference metadata

Modified: trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/EJBRemoteHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/EJBRemoteHandler.java	2008-04-18 00:16:24 UTC (rev 72409)
+++ trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/EJBRemoteHandler.java	2008-04-18 02:55:09 UTC (rev 72410)
@@ -169,14 +169,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();
+            }
          }
       }