From 2d2283c89d45999811e1724ce7b8089b01c11461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Tue, 26 Sep 2017 10:01:01 +0200 Subject: [PATCH 1/3] [KARAF-5387] Implement getCharset() method in the JLineTerminal --- .../org/apache/karaf/shell/impl/console/JLineTerminal.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 ef6fba2019b..3dba68ab324 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 @@ -22,6 +22,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.PrintWriter; +import java.nio.charset.Charset; import java.util.EnumSet; import java.util.Objects; import java.util.Set; @@ -133,6 +134,11 @@ public PrintWriter writer() { return terminal.writer(); } + @Override + public Charset encoding() { + return Charset.defaultCharset(); + } + @Override public InputStream input() { return terminal.input(); From 2a68588ed9abb72c98e884bfd58475fc8bb051a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Tue, 26 Sep 2017 16:27:18 +0200 Subject: [PATCH 2/3] [KARAF-5387] Fix encoding in SshTerminal --- .../src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java index 67312434de2..c5c27189072 100644 --- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java +++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshTerminal.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.nio.charset.Charset; import java.util.EnumSet; import java.util.Map; @@ -44,7 +45,7 @@ public SshTerminal(Environment environment, InputStream input, OutputStream outp environment.getEnv().get(Environment.ENV_TERM), input, output, - "UTF-8"); + Charset.forName("UTF-8")); this.environment = environment; this.environment.addSignalListener(this::handleSignal); for (Map.Entry e : environment.getPtyModes().entrySet()) { From 15ec89d43efadac16c43226d0b908bc646ac9f9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= Date: Wed, 27 Sep 2017 07:36:20 +0200 Subject: [PATCH 3/3] [KARAF-5387] Fix encoding in WebTerminal --- .../java/org/apache/karaf/webconsole/gogo/WebTerminal.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java b/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java index c916c0b2c74..71bc445a29b 100644 --- a/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java +++ b/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; + import java.nio.charset.Charset; import java.util.EnumSet; import org.apache.karaf.shell.api.console.SignalListener; @@ -28,7 +29,7 @@ public class WebTerminal extends ExternalTerminal implements Terminal { public WebTerminal(int width, int height, InputStream input, OutputStream output) throws IOException { - super("Karaf Web Terminal", "ansi", input, output, "UTF-8"); + super("Karaf Web Terminal", "ansi", input, output, Charset.forName("UTF-8")); size.setColumns(width); size.setRows(height); }