[jboss-cvs] JBossAS SVN: r58338 - trunk/server/src/main/org/jboss/ejb

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

Author: alex.loubyansky at jboss.com
Date: 2006-11-14 09:12:08 -0500 (Tue, 14 Nov 2006)
New Revision: 58338

Modified:
   trunk/server/src/main/org/jboss/ejb/EjbUtil.java
Log:
fixed NPE and CCE

Modified: trunk/server/src/main/org/jboss/ejb/EjbUtil.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/EjbUtil.java	2006-11-14 14:01:10 UTC (rev 58337)
+++ trunk/server/src/main/org/jboss/ejb/EjbUtil.java	2006-11-14 14:12:08 UTC (rev 58338)
@@ -171,7 +171,7 @@
       {
          // <ejb-link> contains a Bean Name, scan the DeploymentInfo tree
          DeploymentContext top = unit.getDeploymentContext();
-         while (top != null)
+         while (top.getParent() != null)
          {
             top = top.getParent();
          }
@@ -759,7 +759,7 @@
       Iterator it = ctx.getChildren().iterator();
       while (it.hasNext() && ejbName == null)
       {
-         DeploymentInfo child = (DeploymentInfo) it.next();
+         DeploymentContext child = (DeploymentContext)it.next();
          ejbName = resolveAbsoluteLink(child, link, isLocal);
       }