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:49 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 59c11e4de -> db76362b2


[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)
(cherry picked from commit 070caf7b55215ce8218779f1936a55802843ea3e)


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

Branch: refs/heads/master
Commit: db76362b2a860e3a7984496ace71952e24fb0be4
Parents: 59c11e4
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:42:24 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/db76362b/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 17a0a84..1cbe4b5 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
@@ -492,6 +492,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