From 37e823cbfd3a777801adc9fe4cb1212bf8d4aa46 Mon Sep 17 00:00:00 2001
From: Jacobus Martinus Kruithof <jkf@apache.org>
Date: Fri, 22 Dec 2006 21:00:35 +0000
Subject: [PATCH] improved handling of non-existent vmwatcher file.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@489763 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tools/ant/taskdefs/optional/junit/JUnitTask.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 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 8ba565bf6..3efd5deac 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
@@ -1025,13 +1025,20 @@ public class JUnitTask extends Task {
             String vmCrashString = "unknown";
             BufferedReader br = null;
             try {
-                br = new BufferedReader(new FileReader(vmWatcher));
-                vmCrashString = br.readLine();
+                if (vmWatcher.exists()) {
+                    br = new BufferedReader(new FileReader(vmWatcher));
+                    vmCrashString = br.readLine();
+                } else {
+                    vmCrashString = "Monitor file ("+vmWatcher.getAbsolutePath()+") missing, location writable? Alternatively testcase not started!";
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 // ignored.
             } finally {
                 FileUtils.close(br);
+                if (vmWatcher.exists()) {
+                    vmWatcher.delete();
+                }
             }
             if (watchdog != null && watchdog.killedProcess()) {
                 result.timedOut = true;
@@ -1040,7 +1047,6 @@ public class JUnitTask extends Task {
                 result.crashed = true;
                 logVmCrash(feArray, test, vmCrashString);
             }
-            vmWatcher.delete();
 
             if (!propsFile.delete()) {
                 throw new BuildException("Could not delete temporary "