maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/util Xpp3DomUtils.java
Date Wed, 20 Apr 2005 16:46:27 GMT
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


Mime
View raw message