Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 51296 invoked from network); 20 May 2005 21:18:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 May 2005 21:18:26 -0000 Received: (qmail 60737 invoked by uid 500); 20 May 2005 21:18:25 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 60710 invoked by uid 500); 20 May 2005 21:18:24 -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 60697 invoked by uid 99); 20 May 2005 21:18:24 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 20 May 2005 14:18:24 -0700 Received: (qmail 51186 invoked by uid 65534); 20 May 2005 21:18:21 -0000 Message-ID: <20050520211821.51185.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r171157 - /geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java Date: Fri, 20 May 2005 21:18:21 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Fri May 20 14:18:19 2005 New Revision: 171157 URL: http://svn.apache.org/viewcvs?rev=3D171157&view=3Drev Log: avoid NPE Modified: geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/nami= ng/deployment/ENCConfigBuilder.java Modified: geronimo/trunk/modules/naming-builder/src/java/org/apache/geronim= o/naming/deployment/ENCConfigBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/sr= c/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?rev=3D17= 1157&r1=3D171156&r2=3D171157&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/nami= ng/deployment/ENCConfigBuilder.java (original) +++ geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/nami= ng/deployment/ENCConfigBuilder.java Fri May 20 14:18:19 2005 @@ -49,7 +49,6 @@ import org.apache.geronimo.xbeans.geronimo.naming.GerEjbLocalRefType; import org.apache.geronimo.xbeans.geronimo.naming.GerEjbRefType; import org.apache.geronimo.xbeans.geronimo.naming.GerGbeanLocatorType; -import org.apache.geronimo.xbeans.geronimo.naming.GerPortType; import org.apache.geronimo.xbeans.geronimo.naming.GerResourceEnvRefType; import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType; import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType; @@ -733,10 +732,12 @@ =20 private static Map mapServiceRefs(GerServiceRefType[] refs) { Map refMap =3D new HashMap(); - for (int i =3D 0; i < refs.length; i++) { - GerServiceRefType ref =3D refs[i]; - String serviceRefName =3D ref.getServiceRefName().trim(); - refMap.put(serviceRefName, ref); + if (refs !=3D null) { + for (int i =3D 0; i < refs.length; i++) { + GerServiceRefType ref =3D refs[i]; + String serviceRefName =3D ref.getServiceRefName().trim(); + refMap.put(serviceRefName, ref); + } } return refMap; }