geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1092071 - /geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
Date Thu, 14 Apr 2011 09:19:49 GMT
Author: genspring
Date: Thu Apr 14 09:19:49 2011
New Revision: 1092071

URL: http://svn.apache.org/viewvc?rev=1092071&view=rev
Log:
The cause/solution turned out to be the same to trunk@642366,   don't process env-entry already
processed by other builders

Modified:
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java?rev=1092071&r1=1092070&r2=1092071&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
Thu Apr 14 09:19:49 2011
@@ -35,6 +35,7 @@ import org.apache.geronimo.gbean.annotat
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
+import org.apache.geronimo.j2ee.deployment.NamingBuilder;
 import org.apache.geronimo.j2ee.deployment.annotation.ResourceAnnotationHelper;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.naming.reference.ClassReference;
@@ -107,6 +108,14 @@ public class EnvironmentEntryBuilder ext
         for (Map.Entry<String, EnvEntry> entry : specDD.getEnvEntryMap().entrySet())
{
             String name = entry.getKey();
             EnvEntry envEntry = entry.getValue();
+            
+            if (lookupJndiContextMap(module, name) != null) {
+                // some other builder handled this entry already
+                addInjections(normalize(name), envEntry.getInjectionTarget(), NamingBuilder.INJECTION_KEY.get(sharedContext));
+                
+                continue;
+            }         
+            
             String type = getStringValue(envEntry.getEnvEntryType());
 
             Object value = null;



Mime
View raw message