From 198880a644437e0cfb31cb65ee56c3d2d1b2d858 Mon Sep 17 00:00:00 2001
From: Sam Ruby <rubys@apache.org>
Date: Thu, 2 Aug 2001 16:15:24 +0000
Subject: [PATCH] Avoid NPE's - seen when running JUnit on Win2K

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269443 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/taskdefs/Execute.java           | 4 ++--
 .../apache/tools/ant/taskdefs/optional/junit/JUnitTask.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java
index 1c397d569..4129ce25d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Execute.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java
@@ -627,7 +627,7 @@ public class Execute {
         public Process exec(Project project, String[] cmd, String[] env, File workingDir) throws IOException
         {
             File commandDir = workingDir;
-            if ( workingDir == null ) {
+            if ( workingDir == null && project != null ) {
                 commandDir = project.getBaseDir();
             }
 
@@ -712,7 +712,7 @@ public class Execute {
 
             // Build the command
             File commandDir = workingDir;
-            if ( workingDir == null ) {
+            if ( workingDir == null && project != null ) {
                 commandDir = project.getBaseDir();
             }
 
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 b8872eec1..cb8ccf503 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
@@ -488,9 +488,9 @@ public class JUnitTask extends Task {
 
         Execute execute = new Execute(new LogStreamHandler(this, Project.MSG_INFO, Project.MSG_WARN), watchdog);
         execute.setCommandline(cmd.getCommandline());
+        execute.setAntRun(project);
         if (dir != null) {
             execute.setWorkingDirectory(dir);
-            execute.setAntRun(project);
         }
 
         log("Executing: "+cmd.toString(), Project.MSG_VERBOSE);