svn commit: r999363 - /karaf/branches/karaf-2.0.x/client/src/main/java/org/apache/karaf/client/Main.java

[gn...@apache.org]

Author: gnodet
Date: Tue Sep 21 12:03:56 2010
New Revision: 999363

URL: http://svn.apache.org/viewvc?rev=999363&view=rev
Log:
KARAF-204: Ctrl+D must be followed by another charater to close the console when using the karaf client

Modified:
    karaf/branches/karaf-2.0.x/client/src/main/java/org/apache/karaf/client/Main.java

Modified: karaf/branches/karaf-2.0.x/client/src/main/java/org/apache/karaf/client/Main.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.0.x/client/src/main/java/org/apache/karaf/client/Main.java?rev=999363&r1=999362&r2=999363&view=diff
==============================================================================
--- karaf/branches/karaf-2.0.x/client/src/main/java/org/apache/karaf/client/Main.java (original)
+++ karaf/branches/karaf-2.0.x/client/src/main/java/org/apache/karaf/client/Main.java Tue Sep 21 12:03:56 2010
@@ -28,6 +28,7 @@ import org.apache.sshd.client.channel.Ch
 import org.apache.sshd.client.future.ConnectFuture;
 import org.apache.sshd.common.RuntimeSshException;
 
+import org.apache.sshd.common.util.NoCloseInputStream;
 import org.fusesource.jansi.AnsiConsole;
 import org.slf4j.impl.SimpleLogger;
 
@@ -118,7 +119,7 @@ public class Main {
 			} else {
                 terminal = new TerminalFactory().getTerminal();
  				channel = session.createChannel("shell");
-                channel.setIn(System.in);
+                channel.setIn(new NoCloseInputStream(System.in));
                 ((ChannelShell) channel).setupSensibleDefaultPty();
             }
             channel.setOut(AnsiConsole.wrapOutputStream(System.out));