Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 15693 invoked from network); 15 Aug 2007 17:07:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Aug 2007 17:07:41 -0000 Received: (qmail 1796 invoked by uid 500); 15 Aug 2007 17:07:39 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 1759 invoked by uid 500); 15 Aug 2007 17:07:39 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 1748 invoked by uid 99); 15 Aug 2007 17:07:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Aug 2007 10:07:39 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Aug 2007 17:07:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B61491A981A; Wed, 15 Aug 2007 10:07:18 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: hogstrom@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070815170718.B61491A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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; } }