diff --git a/src/main/org/apache/tools/ant/taskdefs/Ant.java b/src/main/org/apache/tools/ant/taskdefs/Ant.java index 20ab62d92..321b283e8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Ant.java +++ b/src/main/org/apache/tools/ant/taskdefs/Ant.java @@ -179,6 +179,24 @@ public class Ant extends Task { } } + protected void handleOutput(String line) { + if (p1 != null) { + p1.demuxOutput(line, false); + } + else { + super.handleOutput(line); + } + } + + protected void handleErrorOutput(String line) { + if (p1 != null) { + p1.demuxOutput(line, true); + } + else { + super.handleErrorOutput(line); + } + } + /** * Do the execution. */ diff --git a/src/main/org/apache/tools/ant/taskdefs/CallTarget.java b/src/main/org/apache/tools/ant/taskdefs/CallTarget.java index 71b180e27..2aaf9bc81 100644 --- a/src/main/org/apache/tools/ant/taskdefs/CallTarget.java +++ b/src/main/org/apache/tools/ant/taskdefs/CallTarget.java @@ -127,4 +127,23 @@ public class CallTarget extends Task { public void setTarget(String target) { subTarget = target; } + + protected void handleOutput(String line) { + if (callee != null) { + callee.handleOutput(line); + } + else { + super.handleOutput(line); + } + } + + protected void handleErrorOutput(String line) { + if (callee != null) { + callee.handleErrorOutput(line); + } + else { + super.handleErrorOutput(line); + } + } + }