Browse Source

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
master
Jacobus Martinus Kruithof 19 years ago
parent
commit
37e823cbfd
1 changed files with 9 additions and 3 deletions
  1. +9
    -3
      src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java

+ 9
- 3
src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java View File

@@ -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 "


Loading…
Cancel
Save