From 74f2e55f3c8dbbb5e162854964c52b41454650cc Mon Sep 17 00:00:00 2001 From: Nicolas Lalevee Date: Mon, 28 Jun 2010 20:22:30 +0000 Subject: [PATCH] make the flush of the error stream actually flush git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@958704 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/UnknownElement.java | 4 ++-- src/main/org/apache/tools/ant/taskdefs/Java.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Redirector.java | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/org/apache/tools/ant/UnknownElement.java b/src/main/org/apache/tools/ant/UnknownElement.java index 45660ca45..5eb781105 100644 --- a/src/main/org/apache/tools/ant/UnknownElement.java +++ b/src/main/org/apache/tools/ant/UnknownElement.java @@ -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); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java index 180128c22..19f4e32a6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Java.java +++ b/src/main/org/apache/tools/ant/taskdefs/Java.java @@ -732,7 +732,7 @@ public class Java extends Task { if (redirector.getErrorStream() != null) { redirector.handleErrorFlush(output); } else { - super.handleErrorOutput(output); + super.handleErrorFlush(output); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/Redirector.java b/src/main/org/apache/tools/ant/taskdefs/Redirector.java index 7d5049c71..7f39a5e17 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Redirector.java +++ b/src/main/org/apache/tools/ant/taskdefs/Redirector.java @@ -843,6 +843,7 @@ public class Redirector { errorPrintStream = new PrintStream(errorStream); } errorPrintStream.print(output); + errorPrintStream.flush(); } }