You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/05/21 18:05:46 UTC

svn commit: r658735 - in /servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell: commands/utils/ExecuteCommand.java spring/ProxyIO.java

Author: gnodet
Date: Wed May 21 09:05:45 2008
New Revision: 658735

URL: http://svn.apache.org/viewvc?rev=658735&view=rev
Log:
SMX4KNL-40: Remote console does not display output

Modified:
    servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/utils/ExecuteCommand.java
    servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/ProxyIO.java

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/utils/ExecuteCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/utils/ExecuteCommand.java?rev=658735&r1=658734&r2=658735&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/utils/ExecuteCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/utils/ExecuteCommand.java Wed May 21 09:05:45 2008
@@ -49,25 +49,7 @@
 
         Process p = builder.start();
 
-        PumpStreamHandler handler = new PumpStreamHandler(io.inputStream, io.outputStream, io.errorStream) {
-            protected Thread createPump(final InputStream in, final OutputStream out, final boolean closeWhenExhausted) {
-                assert in != null;
-                assert out != null;
-                final Thread result = new Thread(new StreamPumper(in, out, closeWhenExhausted)) {
-                    private IO io;
-                    public void start() {
-                        io = ProxyIO.getIO();
-                        super.start();
-                    }
-                    public void run() {
-                        ProxyIO.setIO(io);
-                        super.run();
-                    }
-                };
-                result.setDaemon(true);
-                return result;
-            }
-        };
+        PumpStreamHandler handler = new PumpStreamHandler(io.inputStream, io.outputStream, io.errorStream);
         handler.attach(p);
         handler.start();
 

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/ProxyIO.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/ProxyIO.java?rev=658735&r1=658734&r2=658735&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/ProxyIO.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/ProxyIO.java Wed May 21 09:05:45 2008
@@ -31,7 +31,7 @@
  */
 public class ProxyIO extends IO {
 
-    private static final ThreadLocal<IO> TLS_IO = new ThreadLocal<IO>();
+    private static final ThreadLocal<IO> TLS_IO = new InheritableThreadLocal<IO>();
 
     public ProxyIO() {
         super(new ProxyInputStream() {