[jboss-cvs] JBossAS SVN: r65262 - trunk/ejb3/src/main/org/jboss/injection.

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

Author: ALRubinger
Date: 2007-09-09 01:10:31 -0400 (Sun, 09 Sep 2007)
New Revision: 65262

Modified:
   trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java
Log:
EJBTHREE-958: Defaulted the origin ENC Name containing the value for the injected field to default to the field name if @Resource.name is not specified

Modified: trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java	2007-09-09 05:07:47 UTC (rev 65261)
+++ trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java	2007-09-09 05:10:31 UTC (rev 65262)
@@ -451,8 +451,11 @@
       String encName = ref.name();
       if (encName == null || encName.equals(""))
       {
-         //encName = InjectionUtil.getEncName(field);
-         encName = property.getDeclaringClass().getName() + "/" + property.getName();
+         // EJBTHREE-958
+         // Default to the name of the field if the "name" attribute of @Resource is not specified
+         //encName = InjectionUtil.getEncName(field); // Previously Removed
+         //encName = property.getDeclaringClass().getName() + "/" + property.getName(); // ALR Removed for EJBTHREE-958
+         encName = property.getName();
       }
       if (!encName.startsWith("env/"))
       {