Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 60439 invoked from network); 17 Jul 2004 15:10:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 17 Jul 2004 15:10:15 -0000 Received: (qmail 77055 invoked by uid 500); 17 Jul 2004 15:10:13 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 77011 invoked by uid 500); 17 Jul 2004 15:10:12 -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 76995 invoked by uid 500); 17 Jul 2004 15:10:12 -0000 Received: (qmail 76977 invoked by uid 99); 17 Jul 2004 15:10:12 -0000 X-ASF-Spam-Status: No, hits=0.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Sat, 17 Jul 2004 08:10:11 -0700 Received: (qmail 60182 invoked by uid 1652); 17 Jul 2004 15:10:11 -0000 Date: 17 Jul 2004 15:10:11 -0000 Message-ID: <20040717151011.60181.qmail@minotaur.apache.org> From: antoine@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N antoine 2004/07/17 08:10:11 Modified: . WHATSNEW CONTRIBUTORS src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java Log: Prevent AbstractCvsTask from closing its output and error streams prematurely PR: 30097 Submitted by: Will Wang (telerice at yahoo dot com) Revision Changes Path 1.638 +16 -1 ant/WHATSNEW Index: WHATSNEW =================================================================== RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.637 retrieving revision 1.638 diff -u -r1.637 -r1.638 --- WHATSNEW 15 Jul 2004 16:43:13 -0000 1.637 +++ WHATSNEW 17 Jul 2004 15:10:10 -0000 1.638 @@ -28,8 +28,23 @@ specification of multiple sub-build targets, which are executed with a single dependency analysis. -Changes from Ant 1.6.1 to current Ant 1.6 CVS version +Changes from Ant 1.6.2 to current Ant 1.6 CVS version ===================================================== + +Changes that could break older environments: +-------------------------------------------- + +Other changes: +-------------- + +Fixed bugs: +----------- + +* AbstractCvsTask prematurely closed its outputStream and errorStream. + Bugzilla 30097. + +Changes from Ant 1.6.1 to Ant 1.6.2 +=================================== Changes that could break older environments: -------------------------------------------- 1.27 +1 -0 ant/CONTRIBUTORS Index: CONTRIBUTORS =================================================================== RCS file: /home/cvs/ant/CONTRIBUTORS,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- CONTRIBUTORS 2 Jul 2004 07:23:53 -0000 1.26 +++ CONTRIBUTORS 17 Jul 2004 15:10:11 -0000 1.27 @@ -196,6 +196,7 @@ Tom Dimock Tom Eugelink Ulrich Schmidt +Will Wang William Ferguson Wolfgang Werner Wolf Siberski 1.35 +15 -15 ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java Index: AbstractCvsTask.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- AbstractCvsTask.java 14 Apr 2004 15:42:06 -0000 1.34 +++ AbstractCvsTask.java 17 Jul 2004 15:10:11 -0000 1.35 @@ -365,21 +365,6 @@ } else { log("Caught exception: " + e.getMessage(), Project.MSG_WARN); } - } finally { - if (outputStream != null) { - try { - outputStream.close(); - } catch (IOException e) { - //ignore - } - } - if (errorStream != null) { - try { - errorStream.close(); - } catch (IOException e) { - //ignore - } - } } } @@ -413,6 +398,21 @@ removeCommandline(cloned); } setCommand(savedCommand); + + if (outputStream != null) { + try { + outputStream.close(); + } catch (IOException e) { + //ignore + } + } + if (errorStream != null) { + try { + errorStream.close(); + } catch (IOException e) { + //ignore + } + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org