[jboss-cvs] JBossAS SVN: r62501 - branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc.

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

Author: wolfc
Date: 2007-04-24 04:04:13 -0400 (Tue, 24 Apr 2007)
New Revision: 62501

Modified:
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentEjbResolver.java
Log:
EJBTHREE-931: merged from trunk

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentEjbResolver.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentEjbResolver.java	2007-04-24 03:11:12 UTC (rev 62500)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/enc/DeploymentEjbResolver.java	2007-04-24 08:04:13 UTC (rev 62501)
@@ -27,6 +27,7 @@
 import org.jboss.ejb3.ProxyFactoryHelper;
 import org.jboss.ejb3.Container;
 import org.jboss.ejb3.DeploymentScope;
+import org.jboss.logging.Logger;
 
 import javax.naming.NameNotFoundException;
 import java.util.Iterator;
@@ -43,6 +44,8 @@
  */
 public abstract class DeploymentEjbResolver
 {
+   private static final Logger log = Logger.getLogger(DeploymentEjbResolver.class);
+   
    protected DeploymentScope deploymentScope;
    protected String errorName;
 
@@ -59,11 +62,19 @@
       int hashIndex = ejbLink.indexOf('#');
       if (hashIndex != -1)
       {
-         if (deploymentScope == null) return null;
+         if (deploymentScope == null)
+         {
+            log.warn("ejb link '" + ejbLink + "' is relative, but no deployment scope found");
+            return null;
+         }
          String relativePath = ejbLink.substring(0, hashIndex);
          Ejb3Deployment dep = deploymentScope.findRelativeDeployment(relativePath);
-         if (dep == null) return null;
-         String ejbName = ejbLink.substring(hashIndex);
+         if (dep == null)
+         {
+            log.warn("can't find a deployment for path '" + relativePath + "' of ejb link '" + ejbLink + "'");
+            return null;
+         }
+         String ejbName = ejbLink.substring(hashIndex + 1);
          return dep.getEjbContainer(ejbName, businessIntf);
       }
       // look internally