jglick 2005/03/29 12:40:01
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
ExecuteJava.java
Log:
Merge of #32941: do not catch ThreadDeath when <java fork="false"> is halted.
Revision Changes Path
No revision
No revision
1.38.2.7 +2 -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.38.2.6
retrieving revision 1.38.2.7
diff -u -r1.38.2.6 -r1.38.2.7
--- ExecuteJava.java 4 Feb 2005 08:13:46 -0000 1.38.2.6
+++ ExecuteJava.java 29 Mar 2005 20:40:01 -0000 1.38.2.7
@@ -172,6 +172,8 @@
+ " classpath");
} catch (SecurityException e) {
throw e;
+ } catch (ThreadDeath e) {
+ throw e;
} catch (Throwable e) {
throw new BuildException(e);
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
