You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2010/06/28 22:22:31 UTC
svn commit: r958704 - in /ant/core/trunk/src/main/org/apache/tools/ant:
UnknownElement.java taskdefs/Java.java taskdefs/Redirector.java
Author: hibou
Date: Mon Jun 28 20:22:30 2010
New Revision: 958704
URL: http://svn.apache.org/viewvc?rev=958704&view=rev
Log:
make the flush of the error stream actually flush
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Java.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Redirector.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java?rev=958704&r1=958703&r2=958704&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java Mon Jun 28 20:22:30 2010
@@ -269,9 +269,9 @@ public class UnknownElement extends Task
*/
protected void handleErrorFlush(String output) {
if (realThing instanceof Task) {
- ((Task) realThing).handleErrorOutput(output);
+ ((Task) realThing).handleErrorFlush(output);
} else {
- super.handleErrorOutput(output);
+ super.handleErrorFlush(output);
}
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Java.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Java.java?rev=958704&r1=958703&r2=958704&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Java.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Java.java Mon Jun 28 20:22:30 2010
@@ -732,7 +732,7 @@ public class Java extends Task {
if (redirector.getErrorStream() != null) {
redirector.handleErrorFlush(output);
} else {
- super.handleErrorOutput(output);
+ super.handleErrorFlush(output);
}
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Redirector.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Redirector.java?rev=958704&r1=958703&r2=958704&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Redirector.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Redirector.java Mon Jun 28 20:22:30 2010
@@ -843,6 +843,7 @@ public class Redirector {
errorPrintStream = new PrintStream(errorStream);
}
errorPrintStream.print(output);
+ errorPrintStream.flush();
}
}