ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r917817 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java
Date Tue, 02 Mar 2010 00:15:44 GMT
Author: antoine
Date: Tue Mar  2 00:15:44 2010
New Revision: 917817

URL: http://svn.apache.org/viewvc?rev=917817&view=rev
Log:
fix for bug 48789 -  Pipe broken. 
This is an issue that we have been experiencing in the gump runs on Ubuntu.
The tests below will hopefully be fixed by this checkin. 
src/tests/antunit/taskdefs/exec/apply-test.xml : testRedirector13 and testRedirector14 
src/tests/antunit/taskdefs/exec/exec-test.xml  : test-redirector-outputfilterchain-errorfilterchain

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=917817&r1=917816&r2=917817&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Mar  2 00:15:44 2010
@@ -46,7 +46,10 @@
    Bugzilla Report 48816.        
    
 *  <get> with an invalid URL could trigger an NPE in some JVMs.
-   Bugzilla Report 48833 
+   Bugzilla Report 48833
+   
+*  Broken Pipe issue under Ubuntu Linux
+   Bugzilla Report 48789    
 
 Other changes:
 --------------

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java?rev=917817&r1=917816&r2=917817&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java Tue Mar 
2 00:15:44 2010
@@ -129,8 +129,6 @@
      * Stop pumping the streams.
      */
     public void stop() {
-        finish(outputThread);
-        finish(errorThread);
 
         if (inputPump != null) {
             inputPump.stop();
@@ -146,6 +144,8 @@
         } catch (IOException e) {
             // ignore
         }
+        finish(outputThread);
+        finish(errorThread);
     }
 
     private static final long JOIN_TIMEOUT = 500;



Mime
View raw message