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 2007/08/14 22:47:31 UTC
svn commit: r565904 -
/geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
Author: gawor
Date: Tue Aug 14 13:47:30 2007
New Revision: 565904
URL: http://svn.apache.org/viewvc?view=rev&rev=565904
Log:
add injection target entries to existing env-entry entries (GERONIMO-3411)
Modified:
geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
Modified: geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java?view=diff&rev=565904&r1=565903&r2=565904
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java Tue Aug 14 13:47:30 2007
@@ -148,6 +148,12 @@
for (EnvEntryType envEntry : envEntries) {
if (getStringValue(envEntry.getEnvEntryName()).equals(resourceName)) {
exists = true;
+ if (method != null || field != null) {
+ InjectionTargetType[] targets = envEntry.getInjectionTargetArray();
+ if (!hasTarget(method, field, targets)) {
+ configureInjectionTarget(envEntry.addNewInjectionTarget(), method, field);
+ }
+ }
break;
}
}