Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 9451 invoked from network); 9 Feb 2011 20:26:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Feb 2011 20:26:45 -0000 Received: (qmail 96777 invoked by uid 500); 9 Feb 2011 20:26:45 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 96743 invoked by uid 500); 9 Feb 2011 20:26:44 -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 96735 invoked by uid 99); 9 Feb 2011 20:26:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Feb 2011 20:26:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Feb 2011 20:26:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B585E23889E7; Wed, 9 Feb 2011 20:26:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1069071 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java Date: Wed, 09 Feb 2011 20:26:21 -0000 To: scm@geronimo.apache.org From: tkirby@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110209202621.B585E23889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tkirby Date: Wed Feb 9 20:26:21 2011 New Revision: 1069071 URL: http://svn.apache.org/viewvc?rev=1069071&view=rev Log: GERONIMODEVTOOLS-704 fix NPE when defining new server where existingParms is null... Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java?rev=1069071&r1=1069070&r2=1069071&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java Wed Feb 9 20:26:21 2011 @@ -160,10 +160,15 @@ abstract public class GeronimoServerBeha * @return */ private String getServerProgramArgs(String existingProgArgs, GeronimoServerDelegate serverDelegate) { - List parms = new ArrayList(Arrays.asList(existingProgArgs.split("\\s+"))); Set parmsSet = serverDelegate.getProgramArgs(); Set parmsNotSet = serverDelegate.getProgramArgsNotSet(); Set parmsSeen = new HashSet(parmsSet.size()); + List parms; + if (existingProgArgs == null) { + parms = new ArrayList(parmsSet.size()); + } else { + parms = new ArrayList(Arrays.asList(existingProgArgs.split("\\s+"))); + } // remove notSet and duplicate set paramaters from the list for(ListIterator iterator = parms.listIterator(); iterator.hasNext();) { String parm = iterator.next();