From dev-return-62671-apmail-ant-dev-archive=ant.apache.org@ant.apache.org Thu Jan 06 17:30:09 2005 Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 25156 invoked from network); 6 Jan 2005 17:30:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 6 Jan 2005 17:30:08 -0000 Received: (qmail 85671 invoked by uid 500); 6 Jan 2005 17:30:06 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 85626 invoked by uid 500); 6 Jan 2005 17:30:06 -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 85606 invoked by uid 500); 6 Jan 2005 17:30:06 -0000 Received: (qmail 85602 invoked by uid 99); 6 Jan 2005 17:30:05 -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; Thu, 06 Jan 2005 09:30:05 -0800 Received: (qmail 25106 invoked by uid 1539); 6 Jan 2005 17:30:04 -0000 Date: 6 Jan 2005 17:30:04 -0000 Message-ID: <20050106173004.25105.qmail@minotaur.apache.org> From: peterreilly@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Redirector.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N peterreilly 2005/01/06 09:30:04 Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH Redirector.java Log: sync Revision Changes Path No revision No revision 1.11.2.10 +12 -5 ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java Index: Redirector.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java,v retrieving revision 1.11.2.9 retrieving revision 1.11.2.10 diff -u -r1.11.2.9 -r1.11.2.10 --- Redirector.java 6 Jan 2005 11:11:21 -0000 1.11.2.9 +++ Redirector.java 6 Jan 2005 17:30:03 -0000 1.11.2.10 @@ -52,7 +52,7 @@ */ public class Redirector { - private static final String defaultEncoding + private static final String DEFAULT_ENCODING = System.getProperty("file.encoding"); private class PropertyOutputStream extends ByteArrayOutputStream { @@ -152,13 +152,13 @@ private Vector inputFilterChains; /** The output encoding */ - private String outputEncoding = defaultEncoding; + private String outputEncoding = DEFAULT_ENCODING; /** The error encoding */ - private String errorEncoding = defaultEncoding; + private String errorEncoding = DEFAULT_ENCODING; /** The input encoding */ - private String inputEncoding = defaultEncoding; + private String inputEncoding = DEFAULT_ENCODING; /** Whether to complete properties settings **/ private boolean appendProperties = true; @@ -725,17 +725,22 @@ try { managingTask.log(thread[i].toString(), Project.MSG_DEBUG); } catch (NullPointerException enPeaEx) { + // Ignore exception } } Thread.sleep(1000); } catch (InterruptedException eyeEx) { + // Ignore exception } } setProperties(); inputStream = null; - outputStream = errorStream = outPrintStream = errorPrintStream = null; + outputStream = null; + errorStream = null; + outPrintStream = null; + errorPrintStream = null; } /** @@ -747,12 +752,14 @@ try { baos.close(); } catch (IOException eyeOhEx) { + // Ignore exception } } if (errorBaos != null) { try { errorBaos.close(); } catch (IOException eyeOhEx) { + // Ignore exception } } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org