Logic in prepare needs original streams, so don't unwrap early.

jruby · Feb 24, 2015 · 1345982 · 1345982
1 parent 19e4c3a
commit 1345982
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/RubyGlobal.java b/core/src/main/java/org/jruby/RubyGlobal.java
@@ -194,11 +194,11 @@ public static void createGlobals(ThreadContext context, Ruby runtime) {
         runtime.defineVariable(new BacktraceGlobalVariable(runtime, "$@"), THREAD);
 
         IRubyObject stdin = RubyIO.prepStdio(
-                runtime, runtime.getIn(), prepareStdioChannel(runtime, STDIO.IN, ShellLauncher.unwrapFilterInputStream(runtime.getIn())), OpenFile.READABLE, runtime.getIO(), "<STDIN>");
+                runtime, runtime.getIn(), prepareStdioChannel(runtime, STDIO.IN, runtime.getIn()), OpenFile.READABLE, runtime.getIO(), "<STDIN>");
         IRubyObject stdout = RubyIO.prepStdio(
-                runtime, runtime.getOut(), prepareStdioChannel(runtime, STDIO.OUT, ShellLauncher.unwrapFilterOutputStream(runtime.getOut())), OpenFile.WRITABLE, runtime.getIO(), "<STDOUT>");
+                runtime, runtime.getOut(), prepareStdioChannel(runtime, STDIO.OUT, runtime.getOut()), OpenFile.WRITABLE, runtime.getIO(), "<STDOUT>");
         IRubyObject stderr = RubyIO.prepStdio(
-                runtime, runtime.getErr(), prepareStdioChannel(runtime, STDIO.ERR, ShellLauncher.unwrapFilterOutputStream(runtime.getErr())), OpenFile.WRITABLE | OpenFile.SYNC, runtime.getIO(), "<STDERR>");
+                runtime, runtime.getErr(), prepareStdioChannel(runtime, STDIO.ERR, runtime.getErr()), OpenFile.WRITABLE | OpenFile.SYNC, runtime.getIO(), "<STDERR>");
 
         runtime.defineVariable(new InputGlobalVariable(runtime, "$stdin", stdin), GLOBAL);
         runtime.defineVariable(new OutputGlobalVariable(runtime, "$stdout", stdout), GLOBAL);
@@ -285,13 +285,15 @@ private static Channel prepareStdioChannel(Ruby runtime, STDIO stdio, Object str
         } else {
             switch (stdio) {
                 case IN:
+                    stream = ShellLauncher.unwrapFilterInputStream((InputStream)stream);
                     if (stream instanceof FileInputStream) {
                         return ((FileInputStream)stream).getChannel();
                     }
 
                     return Channels.newChannel((InputStream)stream);
                 case OUT:
                 case ERR:
+                    stream = ShellLauncher.unwrapFilterOutputStream((OutputStream)stream);
                     if (stream instanceof FileOutputStream) {
                         return ((FileOutputStream)stream).getChannel();
                     }