You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2015/09/02 07:40:43 UTC

karaf git commit: [KARAF-3965]Calling Ctrl+D in Karaf console, when karaf asks if it is necessary to dispay all console commands, causes console not responding forever

Repository: karaf
Updated Branches:
  refs/heads/karaf-2.x 412b39e94 -> 3acdda767


[KARAF-3965]Calling Ctrl+D in Karaf console, when karaf asks if it is necessary to dispay all console commands, causes console not responding forever


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

Branch: refs/heads/karaf-2.x
Commit: 3acdda767fd06b9a2409327a033ece2eb045ccf4
Parents: 412b39e
Author: Freeman Fang <fr...@gmail.com>
Authored: Wed Sep 2 13:40:30 2015 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Wed Sep 2 13:40:30 2015 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/karaf/shell/console/jline/Console.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/3acdda76/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
index df20ccd..e985b1b 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
@@ -515,6 +515,7 @@ public class Console implements Runnable
                         else if (c == 4 && !getBoolean(IGNORE_INTERRUPTS))
                         {
                             err.println("^D");
+                            interrupt();
                             return;
                         }
                         else if (c == 3 && !getBoolean(IGNORE_INTERRUPTS))