geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r566267 - /geronimo/server/branches/2.0.1/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
Date Wed, 15 Aug 2007 17:07:18 GMT
Author: hogstrom
Date: Wed Aug 15 10:07:17 2007
New Revision: 566267

URL: http://svn.apache.org/viewvc?view=rev&rev=566267
Log:
GERONIMO-3411 injection target entries are not added to existing env-entry entries.

Modified:
    geronimo/server/branches/2.0.1/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java

Modified: geronimo/server/branches/2.0.1/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0.1/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java?view=diff&rev=566267&r1=566266&r2=566267
==============================================================================
--- geronimo/server/branches/2.0.1/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
(original)
+++ geronimo/server/branches/2.0.1/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
Wed Aug 15 10:07:17 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;
                     }
                 }



Mime
View raw message