You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/03/28 21:23:18 UTC
svn commit: r642366 -
/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
Author: gawor
Date: Fri Mar 28 13:23:17 2008
New Revision: 642366
URL: http://svn.apache.org/viewvc?rev=642366&view=rev
Log:
don't process entires already processed by other builders
Modified:
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?rev=642366&r1=642365&r2=642366&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Fri Mar 28 13:23:17 2008
@@ -123,6 +123,10 @@
ClassLoader cl = module.getEarContext().getClassLoader();
for (ResourceRefType resourceRef : resourceRefsUntyped) {
String name = resourceRef.getResRefName().getStringValue().trim();
+ if (lookupJndiContextMap(componentContext, ENV + name) != null) {
+ // some other builder handled this entry already
+ continue;
+ }
addInjections(name, resourceRef.getInjectionTargetArray(), componentContext);
String type = resourceRef.getResType().getStringValue().trim();
GerResourceRefType gerResourceRef = (GerResourceRefType) refMap.get(name);