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

@@ -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();
             }
 

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);