[Jboss-cvs] JBossAS SVN: r56045 - trunk/ejb3/src/main/org/jboss/injection

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

Author: bdecoste
Date: 2006-08-17 20:04:13 -0400 (Thu, 17 Aug 2006)
New Revision: 56045

Modified:
   trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java
Log:
check for null xml

Modified: trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java	2006-08-17 23:30:30 UTC (rev 56044)
+++ trunk/ejb3/src/main/org/jboss/injection/EJBHandler.java	2006-08-18 00:04:13 UTC (rev 56045)
@@ -381,18 +381,23 @@
    protected boolean isIgnoreDependency(InjectionContainer container, EJB ref)
    {
       EnvironmentRefGroup refGroup =  (EnvironmentRefGroup)container.getEnvironmentRefGroup();
-      Iterator<EjbRef> ejbRefs = refGroup.getEjbRefs().iterator();
-      while (ejbRefs.hasNext())
+      
+      if (refGroup != null)
       {
-         EjbRef ejbRef = ejbRefs.next();
-         if (ejbRef.getEjbRefName().equals(ref.name()))
+         Iterator<EjbRef> ejbRefs = refGroup.getEjbRefs().iterator();
+         while (ejbRefs.hasNext())
          {
-            if (ejbRef.isIgnoreDependency())
-               return true;
-            else
-               return false;
+            EjbRef ejbRef = ejbRefs.next();
+            if (ejbRef.getEjbRefName().equals(ref.name()))
+            {
+               if (ejbRef.isIgnoreDependency())
+                  return true;
+               else
+                  return false;
+            }
          }
       }
+      
       return false;
    }
 }