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 2012/10/02 10:39:20 UTC
svn commit: r1392790 -
/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/LocalConsoleManager.java
Author: gnodet
Date: Tue Oct 2 08:39:20 2012
New Revision: 1392790
URL: http://svn.apache.org/viewvc?rev=1392790&view=rev
Log:
[KARAF-1815] Fix forgotten conflict
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/LocalConsoleManager.java
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/LocalConsoleManager.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/LocalConsoleManager.java?rev=1392790&r1=1392789&r2=1392790&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/LocalConsoleManager.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/LocalConsoleManager.java Tue Oct 2 08:39:20 2012
@@ -21,13 +21,12 @@ package org.apache.karaf.shell.console.i
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.net.URL;
+import java.nio.charset.Charset;
import java.security.KeyPair;
import java.util.Hashtable;
-
import javax.security.auth.Subject;
import jline.Terminal;
-
import org.apache.felix.service.command.CommandProcessor;
import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.shell.console.Console;
@@ -86,7 +85,14 @@ public class LocalConsoleManager {
}
};
String agentId = startAgent("karaf");
- this.console = consoleFactory.createLocal(this.commandProcessor, terminal, callback);
+ String ctype = System.getenv("LC_CTYPE");
+ String encoding = ctype;
+ if (encoding != null && encoding.indexOf('.') > 0) {
+ encoding = encoding.substring(encoding.indexOf('.') + 1);
+ } else {
+ encoding = System.getProperty("input.encoding", Charset.defaultCharset().name());
+ }
+ this.console = consoleFactory.createLocal(this.commandProcessor, terminal, encoding, callback);
this.console.getSession().put(SshAgent.SSH_AUTHSOCKET_ENV_NAME, agentId);
Runnable consoleStarter = new Runnable() {