Repository: karaf Updated Branches: refs/heads/master 42c424fde -> 60c1aee17
[KARAF-3971]log:tail and pressing Ctrl-D freezes karaf shell console Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/60c1aee1 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/60c1aee1 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/60c1aee1 Branch: refs/heads/master Commit: 60c1aee173a0465623417058247bea82ee7cd7a9 Parents: 42c424f Author: Freeman Fang <[email protected]> Authored: Thu Sep 10 11:28:51 2015 +0800 Committer: Freeman Fang <[email protected]> Committed: Thu Sep 10 11:28:51 2015 +0800 ---------------------------------------------------------------------- .../org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/60c1aee1/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java ---------------------------------------------------------------------- diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java index 56ff2f8..a8c4ca7 100644 --- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java +++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java @@ -583,6 +583,7 @@ public class ConsoleSessionImpl implements Session { } else if (c == 4 && !ShellUtil.getBoolean(ConsoleSessionImpl.this, Session.IGNORE_INTERRUPTS)) { err.print("^D"); err.flush(); + ConsoleSessionImpl.this.interrupt(); return; } else if (c == 3 && !ShellUtil.getBoolean(ConsoleSessionImpl.this, Session.IGNORE_INTERRUPTS)) { err.println("^C");
