ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgl...@apache.org
Subject svn commit: r498519 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Date Mon, 22 Jan 2007 04:04:16 GMT
Author: jglick
Date: Sun Jan 21 20:04:15 2007
New Revision: 498519

URL: http://svn.apache.org/viewvc?view=rev&rev=498519
Log:
#41422: <junit> in Ant 1.7.0 could throw NPE if no <classpath> was defined.

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?view=diff&rev=498519&r1=498518&r2=498519
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Sun Jan 21 20:04:15 2007
@@ -7,6 +7,9 @@
 Fixed bugs:
 -----------
 
+* <junit> in Ant 1.7.0 could throw NPE if no <classpath> was defined.
+  Bugzilla report 41422.
+
 * In Ant 1.7.0, <fileset> in <javadoc> does not by default include only
   **/*.java as the documentation claims and earlier revisions did.
   Bugzilla report 41264.

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java?view=diff&rev=498519&r1=498518&r2=498519
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java Sun
Jan 21 20:04:15 2007
@@ -756,7 +756,10 @@
         if (splitJunit) {
             Path path = new Path(getProject());
             path.add(antRuntimeClasses);
-            path.add(getCommandline().getClasspath());
+            Path extra = getCommandline().getClasspath();
+            if (extra != null) {
+                path.add(extra);
+            }
             mirrorLoader = new SplitLoader(myLoader, path);
         } else {
             mirrorLoader = myLoader;



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


Mime
View raw message