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

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

Author: wolfc
Date: 2008-05-20 10:24:11 -0400 (Tue, 20 May 2008)
New Revision: 73523

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java
Log:
EJBTHREE-1289: added warning

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-05-20 12:57:29 UTC (rev 73522)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/EJBRemoteHandler.java	2008-05-20 14:24:11 UTC (rev 73523)
@@ -161,6 +161,10 @@
       // Initialize the lookupName to the encName
       String lookupName = encName;
       
+      // EJBTHREE-1289: this code should be enabled, but MappedDeploymentEndpointResolver is broken
+//      assert lookupName.startsWith("env/") : "encName used to start with 'env/'";
+//      lookupName = lookupName.substring(4);
+      
       // mappedName can be null, because an annotation has not been augmented with resolvedJndiName
       if (mappedName == null)
       {
@@ -193,6 +197,10 @@
       
       if (mappedName == null)
       {
+         // TODO: remove this block, see previous comments
+         log.warn("EJBTHREE-1289: Using legacy EjbEncInjector, because mappedName for enc \"" + encName + "\", field \"" + fieldName
+            + "\" is null (container.environmentRefGroup.annotatedEjbReferences = "
+            + container.getEnvironmentRefGroup().getAnnotatedEjbReferences() + ")");
          // legacy
          injector = new EjbEncInjector(encName, refClass, link, errorType);
       }