cvs commit: maven/src/java/org/apache/maven/project UnitTest.java

[dion]

dion        2004/01/28 05:42:05

  Modified:    src/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
                        UnitTest.java
  Log:
  Fix MAVEN-1140
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.11.10.4 +6 -3      maven/src/java/org/apache/maven/project/UnitTest.java
  
  Index: UnitTest.java
  ===================================================================
  RCS file: /home/cvs/maven/src/java/org/apache/maven/project/UnitTest.java,v
  retrieving revision 1.11.10.3
  retrieving revision 1.11.10.4
  diff -u -r1.11.10.3 -r1.11.10.4
  --- UnitTest.java     26 Jan 2004 23:36:09 -0000      1.11.10.3
  +++ UnitTest.java     28 Jan 2004 13:41:59 -0000      1.11.10.4
  @@ -157,8 +157,11 @@
        */
       void mergeParent(UnitTest parent)
       {
  -        Project.mergeLists(parent.resources, resources);
  -        Project.mergeLists(parent.includes, includes);
  -        Project.mergeLists(parent.excludes, excludes);
  +        if (parent != null)
  +        {
  +            Project.mergeLists(parent.resources, resources);
  +            Project.mergeLists(parent.includes, includes);
  +            Project.mergeLists(parent.excludes, excludes);
  +        }
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]