Return-Path: Delivered-To: apmail-maven-m2-dev-archive@www.apache.org Received: (qmail 22073 invoked from network); 24 Mar 2005 07:54:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 Mar 2005 07:54:36 -0000 Received: (qmail 58074 invoked by uid 500); 24 Mar 2005 07:54:36 -0000 Delivered-To: apmail-maven-m2-dev-archive@maven.apache.org Received: (qmail 58056 invoked by uid 500); 24 Mar 2005 07:54:35 -0000 Mailing-List: contact m2-dev-help@maven.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: "Maven 2 Developers List" Reply-To: "Maven 2 Developers List" Delivered-To: mailing list m2-dev@maven.apache.org Received: (qmail 58040 invoked by uid 500); 24 Mar 2005 07:54:35 -0000 Delivered-To: apmail-maven-components-cvs@apache.org Received: (qmail 58037 invoked by uid 99); 24 Mar 2005 07:54:35 -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; Wed, 23 Mar 2005 23:54:35 -0800 Received: (qmail 22058 invoked by uid 1717); 24 Mar 2005 07:54:34 -0000 Date: 24 Mar 2005 07:54:34 -0000 Message-ID: <20050324075434.22057.qmail@minotaur.apache.org> From: brett@apache.org To: maven-components-cvs@apache.org Subject: cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/plugin DefaultPluginManager.java X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N brett 2005/03/23 23:54:34 Modified: maven-core/src/main/java/org/apache/maven/plugin DefaultPluginManager.java Log: fix NPE when there is no goal configuration Revision Changes Path 1.70 +10 -3 maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Index: DefaultPluginManager.java =================================================================== RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- DefaultPluginManager.java 24 Mar 2005 05:01:05 -0000 1.69 +++ DefaultPluginManager.java 24 Mar 2005 07:54:34 -0000 1.70 @@ -683,14 +683,21 @@ if ( index >= 0 ) { String goalName = goalId.substring( index + 1 ); - for ( Iterator j = plugin.getGoals().iterator(); j.hasNext(); ) + for ( Iterator j = plugin.getGoals().iterator(); j.hasNext() && dom == null; ) { Goal goal = (Goal) j.next(); if ( goal.getId().equals( goalName ) ) { Xpp3Dom goalConfiguration = (Xpp3Dom) goal.getConfiguration(); - dom = Xpp3DomUtils.mergeXpp3Dom( Xpp3DomUtils.copyXpp3Dom( goalConfiguration ), dom ); - break; + if ( goalConfiguration != null ) + { + dom = + Xpp3DomUtils.mergeXpp3Dom( Xpp3DomUtils.copyXpp3Dom( goalConfiguration ), dom ); + } + else + { + dom = new Xpp3Dom( "configuration" ); + } } } }