You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/06/15 15:53:52 UTC
karaf git commit: Fix some minor terminal issues
Repository: karaf
Updated Branches:
refs/heads/karaf-4.1.x ef8b9a312 -> 16dafc4a8
Fix some minor terminal issues
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/16dafc4a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/16dafc4a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/16dafc4a
Branch: refs/heads/karaf-4.1.x
Commit: 16dafc4a8fbd6cc880d65716ea7cf9e6184e16ec
Parents: ef8b9a3
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon May 29 10:32:19 2017 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Jun 15 17:37:33 2017 +0200
----------------------------------------------------------------------
.../org/apache/karaf/shell/impl/console/JLineTerminal.java | 1 +
.../src/main/java/org/apache/karaf/shell/ssh/SshAction.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/16dafc4a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
index 214c860..f61d0ac 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/JLineTerminal.java
@@ -49,6 +49,7 @@ public class JLineTerminal implements Terminal, org.jline.terminal.Terminal {
this.terminal = terminal;
for (Signal signal : Signal.values()) {
terminal.handle(signal, this::handle);
+ handlers.put(signal, SignalHandler.SIG_DFL);
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/16dafc4a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java
----------------------------------------------------------------------
diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java
index 63c1167..256bb3b 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java
@@ -246,9 +246,9 @@ public class SshAction implements Action {
if (ctype != null) {
channel.setEnv("LC_CTYPE", ctype.toString());
}
- channel.setIn(new NoCloseInputStream(System.in));
- channel.setOut(new NoCloseOutputStream(System.out));
- channel.setErr(new NoCloseOutputStream(System.err));
+ channel.setIn(new NoCloseInputStream(jlineTerminal.input()));
+ channel.setOut(new NoCloseOutputStream(jlineTerminal.output()));
+ channel.setErr(new NoCloseOutputStream(jlineTerminal.output()));
channel.open().verify();
SignalListener signalListener = signal -> {
try {