jglick 2005/03/29 12:39:00
Modified: src/main/org/apache/tools/ant/taskdefs ExecuteJava.java
Log:
#32941: do not try to catch ThreadDeath when <java fork="false"> is halted.
Revision Changes Path
1.50 +4 -0
ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
Index: ExecuteJava.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ExecuteJava.java 11 Mar 2005 14:56:48 -0000 1.49
+++ ExecuteJava.java 29 Mar 2005 20:39:00 -0000 1.50
@@ -146,6 +146,7 @@
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 @@
+ " 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 {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
