From d1503ea657ceb138b9453ec8f8d1cd5d929fbbde Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Tue, 16 Apr 2002 14:01:17 +0000 Subject: [PATCH] fix nasty NPE in when the user doesn't specify a nested . git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272471 13f79535-47bb-0310-9956-ffa450edef68 --- .../taskdefs/optional/junit/JUnitTask.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index 04a7dad22..f36dc8958 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -722,14 +722,17 @@ public class JUnitTask extends Task { 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 @@ public class JUnitTask extends Task { if (sysProperties != null) { sysProperties.restoreSystem(); } - cl.resetThreadContextLoader(); + if (cl != null) { + cl.resetThreadContextLoader(); + } } }