From 5aeca1e0e3b1c76c1de38afaf2e6d0f5cc2f5648 Mon Sep 17 00:00:00 2001
From: "Jesse N. Glick" <jglick@apache.org>
Date: Tue, 29 Mar 2005 20:39:00 +0000
Subject: [PATCH] #32941: do not try to catch ThreadDeath when <java
 fork="false"> is halted.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278075 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
index 25c91e8e5..0bf852c20 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
@@ -146,6 +146,7 @@ public class ExecuteJava implements Runnable, TimeoutObserver {
                 thread = new Thread(this, "ExecuteJava");
                 Task currentThreadTask
                     = project.getThreadTask(Thread.currentThread());
+                // XXX is the following really necessary? it is in the same thread group...
                 project.registerThreadTask(thread, currentThreadTask);
                 // if we run into a timeout, the run-away thread shall not
                 // make the VM run forever - if no timeout occurs, Ant's
@@ -180,6 +181,9 @@ public class ExecuteJava implements Runnable, TimeoutObserver {
                                      + " classpath");
         } catch (SecurityException e) {
             throw e;
+        } catch (ThreadDeath e) {
+            // XXX could perhaps also call thread.stop(); not sure if anyone cares
+            throw e;
         } catch (Throwable e) {
             throw new BuildException(e);
         } finally {