Return-Path: Delivered-To: apmail-maven-dev-archive@www.apache.org Received: (qmail 1559 invoked from network); 20 Apr 2005 16:46:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 20 Apr 2005 16:46:31 -0000 Received: (qmail 19902 invoked by uid 500); 20 Apr 2005 16:46:33 -0000 Delivered-To: apmail-maven-dev-archive@maven.apache.org Received: (qmail 19868 invoked by uid 500); 20 Apr 2005 16:46:33 -0000 Mailing-List: contact dev-help@maven.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Maven Developers List" Reply-To: "Maven Developers List" Delivered-To: mailing list dev@maven.apache.org Received: (qmail 19855 invoked by uid 500); 20 Apr 2005 16:46:33 -0000 Received: (qmail 19851 invoked by uid 99); 20 Apr 2005 16:46:33 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=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, 20 Apr 2005 09:46:33 -0700 Received: (qmail 645 invoked by uid 1717); 20 Apr 2005 16:46:27 -0000 Date: 20 Apr 2005 16:46:27 -0000 Message-ID: <20050420164627.641.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/util Xpp3DomUtils.java X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N brett 2005/04/20 09:46:27 Modified: maven-core/src/main/java/org/apache/maven/util Xpp3DomUtils.java Log: PR: MNG-316 Submitted by: Kenney Westerhof Reviewed by: Brett Porter fix NPE when there is no default plugin configuration Revision Changes Path 1.2 +6 -1 maven-components/maven-core/src/main/java/org/apache/maven/util/Xpp3DomUtils.java Index: Xpp3DomUtils.java =================================================================== RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/util/Xpp3DomUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Xpp3DomUtils.java 22 Mar 2005 11:29:55 -0000 1.1 +++ Xpp3DomUtils.java 20 Apr 2005 16:46:27 -0000 1.2 @@ -30,6 +30,11 @@ { // TODO: how to mergeXpp3Dom lists rather than override? // TODO: share this as some sort of assembler, implement a walk interface? + if ( recessive == null ) + { + return; + } + Xpp3Dom[] children = recessive.getChildren(); for ( int i = 0; i < children.length; i++ ) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org For additional commands, e-mail: dev-help@maven.apache.org