Use "out" for output and never return a null stream.

jruby · Feb 24, 2015 · 19e4c3a · 19e4c3a
1 parent e3cf9a9
commit 19e4c3a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/util/ShellLauncher.java b/core/src/main/java/org/jruby/util/ShellLauncher.java
@@ -866,9 +866,11 @@ public static InputStream unwrapBufferedStream(InputStream filteredStream) {
     public static OutputStream unwrapFilterOutputStream(OutputStream filteredStream) {
         while (filteredStream instanceof FilterOutputStream) {
             try {
-                filteredStream = (OutputStream)
+                OutputStream tmpStream = (OutputStream)
                         FieldAccess.getProtectedFieldValue(FilterOutputStream.class,
-                                "in", filteredStream);
+                                "out", filteredStream);
+                if (tmpStream == null) break;
+                filteredStream = tmpStream;
             } catch (Exception e) {
                 break; // break out if we've dug as deep as we can
             }
@@ -891,9 +893,11 @@ public static OutputStream unwrapFilterOutputStream(OutputStream filteredStream)
     public static InputStream unwrapFilterInputStream(InputStream filteredStream) {
         while (filteredStream instanceof FilterInputStream) {
             try {
-                filteredStream = (InputStream)
+                InputStream tmpStream = (InputStream)
                         FieldAccess.getProtectedFieldValue(FilterInputStream.class,
                                 "in", filteredStream);
+                if (tmpStream == null) break;
+                filteredStream = tmpStream;
             } catch (Exception e) {
                 break; // break out if we've dug as deep as we can
             }