[KARAF-2878] The thread reading the system input stream should exit 
automatically when the console bundle stops

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/1128ab7f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1128ab7f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1128ab7f

Branch: refs/heads/karaf-3.0.x
Commit: 1128ab7f0361d8806d9f15edeccf67d2b277b468
Parents: 69cd0d0
Author: Guillaume Nodet <gno...@gmail.com>
Authored: Tue Jul 15 10:31:03 2014 +0200
Committer: Guillaume Nodet <gno...@gmail.com>
Committed: Tue Jul 15 10:31:03 2014 +0200

----------------------------------------------------------------------
 .../org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/1128ab7f/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java
----------------------------------------------------------------------
diff --git 
a/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java
 
b/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java
index 7404465..ea54554 100644
--- 
a/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java
+++ 
b/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java
@@ -486,6 +486,12 @@ public class ConsoleImpl implements Console {
             try {
                 while (running) {
                     try {
+                        while (in.available() == 0) {
+                            if (!running) {
+                                return;
+                            }
+                            Thread.sleep(50);
+                        }
                         int c = in.read();
                         if (c == -1) {
                             return;

Reply via email to