ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Redirector.java
Date Thu, 06 Jan 2005 17:30:04 GMT
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


Mime
View raw message