Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 23674 invoked from network); 28 Mar 2005 21:43:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 Mar 2005 21:43:22 -0000 Received: (qmail 36095 invoked by uid 500); 28 Mar 2005 21:43:20 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 36054 invoked by uid 500); 28 Mar 2005 21:43:20 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 36033 invoked by uid 500); 28 Mar 2005 21:43:20 -0000 Received: (qmail 36027 invoked by uid 99); 28 Mar 2005 21:43:20 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 28 Mar 2005 13:43:19 -0800 Received: (qmail 23651 invoked by uid 1939); 28 Mar 2005 21:43:18 -0000 Date: 28 Mar 2005 21:43:18 -0000 Message-ID: <20050328214318.23650.qmail@minotaur.apache.org> From: jglick@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Execute.java X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N jglick 2005/03/28 13:43:18 Modified: . WHATSNEW src/main/org/apache/tools/ant/taskdefs Execute.java Log: #31928: stop a forked process if the thread running is stopped. Revision Changes Path 1.795 +3 -0 ant/WHATSNEW Index: WHATSNEW =================================================================== RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.794 retrieving revision 1.795 diff -u -r1.794 -r1.795 --- WHATSNEW 25 Mar 2005 12:28:59 -0000 1.794 +++ WHATSNEW 28 Mar 2005 21:43:18 -0000 1.795 @@ -317,6 +317,9 @@ Fixed bugs: ----------- +* Killing a thread running (e.g. from an IDE) would + not stop the forked process. Bugzilla 31928. + * Programs run with can now accept standard input from the Ant console. (Programs run with could already do so.) Bugzilla 24918. 1.94 +4 -4 ant/src/main/org/apache/tools/ant/taskdefs/Execute.java Index: Execute.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- Execute.java 10 Mar 2005 12:50:57 -0000 1.93 +++ Execute.java 28 Mar 2005 21:43:18 -0000 1.94 @@ -27,11 +27,8 @@ import java.io.StringReader; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import java.util.Map; -import java.util.Set; import java.util.Vector; import org.apache.tools.ant.BuildException; @@ -40,7 +37,6 @@ import org.apache.tools.ant.taskdefs.condition.Os; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.util.FileUtils; -import org.apache.tools.ant.util.JavaEnvUtils; /** * Runs an external program. @@ -485,6 +481,10 @@ watchdog.checkException(); } return getExitValue(); + } catch (ThreadDeath t) { + // #31928: forcibly kill it before continuing. + process.destroy(); + throw t; } finally { // remove the process to the list of those to destroy if // the VM exits --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org