From 38700692d4d530ac425ed909482b15d6d3af00d3 Mon Sep 17 00:00:00 2001 From: Nicolas Lalevee Date: Tue, 26 Jul 2011 22:02:37 +0000 Subject: [PATCH] BR 51161: - don't close System.in otherwise it won't be readable anymore git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1151269 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 4 ++++ src/main/org/apache/tools/ant/input/DefaultInputHandler.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/WHATSNEW b/WHATSNEW index 22f8adfd3..79dec794f 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -63,6 +63,10 @@ Fixed bugs: with failonerror=false, so warnings won't get logged Bugzilla Report 48789. + * System.in was closed and not readable anymore by the DefaultInputHandler + when Ant is used via its Java API. + Bugzilla Report 51161 + Other changes: -------------- diff --git a/src/main/org/apache/tools/ant/input/DefaultInputHandler.java b/src/main/org/apache/tools/ant/input/DefaultInputHandler.java index 3bbee97c2..2212c3673 100644 --- a/src/main/org/apache/tools/ant/input/DefaultInputHandler.java +++ b/src/main/org/apache/tools/ant/input/DefaultInputHandler.java @@ -24,6 +24,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.Enumeration; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.util.KeepAliveInputStream; /** * Prompts on System.err, reads input from System.in @@ -118,6 +119,6 @@ public class DefaultInputHandler implements InputHandler { * @return the input stream from which the user input should be read. */ protected InputStream getInputStream() { - return System.in; + return KeepAliveInputStream.wrapSystemIn(); } } \ No newline at end of file