Return-Path: 
 <ant-dev-return-30401-qmlist-jakarta-archive-ant-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-ant-dev-archive@apache.org
Received: (qmail 51747 invoked from network); 16 Apr 2002 14:01:23 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 16 Apr 2002 14:01:23 -0000
Received: (qmail 12730 invoked by uid 97); 16 Apr 2002 14:01:20 -0000
Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org
Received: (qmail 12714 invoked by uid 97); 16 Apr 2002 14:01:20 -0000
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:ant-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:ant-dev-help@jakarta.apache.org>
List-Post: <mailto:ant-dev@jakarta.apache.org>
List-Id: "Ant Developers List" <ant-dev.jakarta.apache.org>
Reply-To: "Ant Developers List" <ant-dev@jakarta.apache.org>
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 12703 invoked by uid 97); 16 Apr 2002 14:01:19 -0000
Date: 16 Apr 2002 14:01:17 -0000
Message-ID: <20020416140117.41209.qmail@icarus.apache.org>
From: bodewig@apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit:
 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit
 JUnitTask.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

bodewig     02/04/16 07:01:17

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/junit
                        JUnitTask.java
  Log:
  fix nasty NPE in <junit> when the user doesn't specify a nested <classpath>.
  
  Revision  Changes    Path
  1.42      +14 -9     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
  
  Index: JUnitTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- JUnitTask.java	15 Apr 2002 12:11:48 -0000	1.41
  +++ JUnitTask.java	16 Apr 2002 14:01:17 -0000	1.42
  @@ -146,7 +146,7 @@
    * @author <a href="mailto:Gerrit.Riessen@web.de">Gerrit Riessen</a>
    * @author <a href="mailto:ehatcher@apache.org">Erik Hatcher</a>
    *
  - * @version $Revision: 1.41 $
  + * @version $Revision: 1.42 $
    *
    * @since Ant 1.2
    *
  @@ -722,14 +722,17 @@
           try {
               log("Using System properties " + System.getProperties(), 
                   Project.MSG_VERBOSE);
  -            Path classpath = (Path) commandline.getClasspath().clone();
  -            if (includeAntRuntime) {
  -                log("Implicitly adding " + antRuntimeClasses + " to CLASSPATH", 
  -                    Project.MSG_VERBOSE);
  -                classpath.append(antRuntimeClasses);
  -            }
  -
  +            Path userClasspath = commandline.getClasspath();
  +            Path classpath = userClasspath == null 
  +                                              ? null 
  +                                              : (Path) userClasspath.clone();
               if (classpath != null) {
  +                if (includeAntRuntime) {
  +                    log("Implicitly adding " + antRuntimeClasses 
  +                        + " to CLASSPATH", Project.MSG_VERBOSE);
  +                    classpath.append(antRuntimeClasses);
  +                }
  +
                   cl = new AntClassLoader(null, project, classpath, false);
                   log("Using CLASSPATH " + cl.getClasspath(),
                       Project.MSG_VERBOSE);
  @@ -772,7 +775,9 @@
               if (sysProperties != null) {
                   sysProperties.restoreSystem();
               }
  -            cl.resetThreadContextLoader();
  +            if (cl != null) {
  +                cl.resetThreadContextLoader();
  +            }
           }
       }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>