Merge remote-tracking branch 'asf/1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/00a4216d Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/00a4216d Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/00a4216d Branch: refs/heads/master Commit: 00a4216d4f117e7c56ad25a9f67f02ad1257d1c3 Parents: de21044 6c860e0 Author: Jaikiran Pai <[email protected]> Authored: Thu Jan 4 11:20:05 2018 +0530 Committer: Jaikiran Pai <[email protected]> Committed: Thu Jan 4 11:20:05 2018 +0530 ---------------------------------------------------------------------- WHATSNEW | 4 + .../taskdefs/exec/exec-with-redirector.xml | 122 +++++++++++++++++++ .../tools/ant/taskdefs/PumpStreamHandler.java | 16 ++- .../apache/tools/ant/taskdefs/StreamPumper.java | 122 ++++++++++++++----- .../ant/taskdefs/ExecStreamRedirectorTest.java | 91 ++++++++++++++ 5 files changed, 321 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/00a4216d/WHATSNEW ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/00a4216d/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java ---------------------------------------------------------------------- diff --cc src/main/org/apache/tools/ant/taskdefs/StreamPumper.java index 6cd16ed,c7afc4d..1ad5058 --- a/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java +++ b/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java @@@ -55,9 -58,9 +58,8 @@@ public class StreamPumper implements Ru this(is, os, closeWhenExhausted, false); } - /** * Create a new StreamPumper. - * * <p><b>Note:</b> If you set useAvailable to true, you must * explicitly invoke {@link #stop stop} or interrupt the * corresponding Thread when you are done or the run method will
