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 2016/10/18 09:16:34 UTC
[1/2] karaf git commit: [KARAF-4782] Encoding is lost in ssh print
streams
Repository: karaf
Updated Branches:
refs/heads/master e6260bcd5 -> f2b5e47cd
[KARAF-4782] Encoding is lost in ssh print streams
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/19cf2a22
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/19cf2a22
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/19cf2a22
Branch: refs/heads/master
Commit: 19cf2a229d5c22aa5243863b2a9dd827c1293772
Parents: e6260bc
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Oct 18 11:14:05 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Oct 18 11:16:12 2016 +0200
----------------------------------------------------------------------
.../org/apache/karaf/shell/ssh/ShellFactoryImpl.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/19cf2a22/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java
----------------------------------------------------------------------
diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java
index f7fdf42..07a63f7 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java
@@ -97,10 +97,10 @@ public class ShellFactoryImpl implements Factory<Command> {
try {
final Subject subject = ShellImpl.this.session != null ? ShellImpl.this.session
.getAttribute(KarafJaasAuthenticator.SUBJECT_ATTRIBUTE_KEY) : null;
- final PrintStream pout = out instanceof PrintStream ? (PrintStream) out : new PrintStream(out);
- final PrintStream perr = err instanceof PrintStream ? (PrintStream) err : out == err ? pout : new PrintStream(err);
+ String encoding = getEncoding(env);
+ final PrintStream pout = out instanceof PrintStream ? (PrintStream) out : new PrintStream(out, false, encoding);
+ final PrintStream perr = err instanceof PrintStream ? (PrintStream) err : out == err ? pout : new PrintStream(err, false, encoding);
terminal = new SshTerminal(env, in, pout);
- String encoding = getEncoding();
shell = sessionFactory.create(in,
pout, perr, terminal, encoding, this::destroy);
for (Map.Entry<String, String> e : env.getEnv().entrySet()) {
@@ -130,9 +130,10 @@ public class ShellFactoryImpl implements Factory<Command> {
*
* @return The default encoding to use when none is specified.
*/
- public static String getEncoding() {
+ public static String getEncoding(Environment env) {
// LC_CTYPE is usually in the form en_US.UTF-8
- String envEncoding = extractEncodingFromCtype(System.getenv("LC_CTYPE"));
+ String ctype = env.getEnv().getOrDefault("LC_TYPE", System.getenv("LC_CTYPE"));
+ String envEncoding = extractEncodingFromCtype(ctype);
if (envEncoding != null) {
return envEncoding;
}
[2/2] karaf git commit: Remove reference to older karaf version
Posted by gn...@apache.org.
Remove reference to older karaf version
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f2b5e47c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f2b5e47c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f2b5e47c
Branch: refs/heads/master
Commit: f2b5e47cd8fe68da4e25a5d1b730cd6ac8d29078
Parents: 19cf2a2
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Oct 18 11:14:23 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Oct 18 11:16:16 2016 +0200
----------------------------------------------------------------------
event/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f2b5e47c/event/pom.xml
----------------------------------------------------------------------
diff --git a/event/pom.xml b/event/pom.xml
index b55221f..01ed27f 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -70,7 +70,6 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.core</artifactId>
- <version>4.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>