Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 29991 invoked from network); 1 Jun 2004 13:34:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 1 Jun 2004 13:34:08 -0000 Received: (qmail 43441 invoked by uid 500); 1 Jun 2004 13:33:50 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 43294 invoked by uid 500); 1 Jun 2004 13:33:47 -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 43235 invoked by uid 500); 1 Jun 2004 13:33:46 -0000 Received: (qmail 43186 invoked by uid 99); 1 Jun 2004 13:33:45 -0000 Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Tue, 01 Jun 2004 06:33:45 -0700 Received: (qmail 29346 invoked by uid 1146); 1 Jun 2004 13:33:25 -0000 Date: 1 Jun 2004 13:33:25 -0000 Message-ID: <20040601133325.29345.qmail@minotaur.apache.org> From: bodewig@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs ProcessDestroyer.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bodewig 2004/06/01 06:33:25 Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH ProcessDestroyer.java Log: merge Revision Changes Path No revision No revision 1.11.2.7 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java Index: ProcessDestroyer.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java,v retrieving revision 1.11.2.6 retrieving revision 1.11.2.7 diff -u -r1.11.2.6 -r1.11.2.7 --- ProcessDestroyer.java 1 Jun 2004 13:30:54 -0000 1.11.2.6 +++ ProcessDestroyer.java 1 Jun 2004 13:33:25 -0000 1.11.2.7 @@ -101,7 +101,7 @@ } catch (IllegalAccessException e) { e.printStackTrace(); } catch (InvocationTargetException e) { - Throwable t = e.getCause(); + Throwable t = e.getTargetException(); if (t != null && t.getClass() == IllegalStateException.class) { // shutdown already is in progress running = true; @@ -130,7 +130,7 @@ } catch (IllegalAccessException e) { e.printStackTrace(); } catch (InvocationTargetException e) { - Throwable t = e.getCause(); + Throwable t = e.getTargetException(); if (t != null && t.getClass() == IllegalStateException.class) { // shutdown already is in progress running = true; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org