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

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

Author: wolfc
Date: 2007-06-05 12:49:29 -0400 (Tue, 05 Jun 2007)
New Revision: 63354

Modified:
   trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java
Log:
EJBTHREE-985: fixed handling of empty env-entry-value

Modified: trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java	2007-06-05 15:23:46 UTC (rev 63353)
+++ trunk/ejb3/src/main/org/jboss/injection/ResourceHandler.java	2007-06-05 16:49:29 UTC (rev 63354)
@@ -76,6 +76,13 @@
       for (EnvEntry envEntry : envEntries)
       {
          String encName = "env/" + envEntry.getEnvEntryName();
+         // 16.4.1.3: If the env-entry-value is not specified, no value will be injected and it
+         // will not be initialized into the naming context.
+         if(envEntry.getEnvEntryValue() == null)
+         {
+            log.debug("ignoring env-entry " + envEntry);
+            continue;
+         }
          InjectionUtil.injectionTarget(encName, envEntry, container, container.getEncInjections());
          if (container.getEncInjectors().containsKey(encName)) continue;
          log.trace("adding env-entry injector " + encName);