karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject 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
Date Wed, 02 Sep 2015 05:42:04 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x 1ca93671c -> 070caf7b5


[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

(cherry picked from commit 3acdda767fd06b9a2409327a033ece2eb045ccf4)


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

Branch: refs/heads/karaf-3.0.x
Commit: 070caf7b55215ce8218779f1936a55802843ea3e
Parents: 1ca9367
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Wed Sep 2 13:40:30 2015 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Wed Sep 2 13:41:27 2015 +0800

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


http://git-wip-us.apache.org/repos/asf/karaf/blob/070caf7b/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 5aa42d5..2fda9a7 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
@@ -503,6 +503,7 @@ public class ConsoleImpl implements Console {
                             return;
                         } else if (c == 4 && !ShellUtil.getBoolean(session, SessionProperties.IGNORE_INTERRUPTS))
{
                             err.println("^D");
+                            interrupt();
                             return;
                         } else if (c == 3 && !ShellUtil.getBoolean(session, SessionProperties.IGNORE_INTERRUPTS))
{
                             err.println("^C");


Mime
View raw message