jruby · Nov 7, 2014 · Nov 7, 2014 · Nov 7, 2014 · Nov 7, 2014
diff --git a/core/src/main/java/org/jruby/RubyArgsFile.java b/core/src/main/java/org/jruby/RubyArgsFile.java
@@ -479,7 +479,7 @@ public static IRubyObject close(ThreadContext context, IRubyObject recv) {
 
         data.next_argv(context);
         if (isClosed(context, data.currentFile)) {
-            throw context.runtime.newIOError("closed stream");
+            throw context.runtime.newIOError(RubyIO.CLOSED_STREAM_MSG);
         }
 
         argf_close(context, data.currentFile);

diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
@@ -112,6 +112,7 @@ public class RubyIO extends RubyObject implements IOEncodable {
     // We use a highly uncommon string to represent the paragraph delimiter (100% soln not worth it)
     public static final ByteList PARAGRAPH_DELIMETER = ByteList.create("PARAGRPH_DELIM_MRK_ER");
     public static final ByteList PARAGRAPH_SEPARATOR = ByteList.create("\n\n");
+    public static final String CLOSED_STREAM_MSG = "closed stream";
 
     // This should only be called by this and RubyFile.
     // It allows this object to be created without a IOHandler.
@@ -851,7 +852,12 @@ private IRubyObject initializeCommon(ThreadContext context, int fileno, IRubyObj
         ChannelFD fd;
 
         if (!FilenoUtil.isFake(fileno)) {
-            fd = new ChannelFD(new NativeDeviceChannel(fileno), runtime.getPosix(), runtime.getFilenoUtil());
+            // try using existing ChannelFD, then fall back on creating a new one
+            fd = runtime.getFilenoUtil().getWrapperFromFileno(fileno);
+
+            if (fd == null) {
+                fd = new ChannelFD(new NativeDeviceChannel(fileno), runtime.getPosix(), runtime.getFilenoUtil());
+            }
         } else {
             ChannelFD descriptor = runtime.getFilenoUtil().getWrapperFromFileno(fileno);
 
@@ -1103,21 +1109,7 @@ public static IRubyObject ensureYieldClose(ThreadContext context, IRubyObject po
             try {
                 return block.yield(context, port);
             } finally {
-                IRubyObject oldExc = runtime.getGlobalVariables().get("$!");
-                try {
-                    if(!(port.respondsTo("closed?") && port.callMethod(context, "closed?").isTrue())) {
-                        if(port.respondsTo("close")) {
-                            port.getMetaClass().finvoke(context, port, "close", IRubyObject.NULL_ARRAY, Block.NULL_BLOCK);
-                        }
-                    }
-                } catch (RaiseException re) {
-                    // MRI behavior: Ignore "closed stream"
-                    if (re.getException().message.asJavaString().equals("closed stream")) {
-                        runtime.getGlobalVariables().set("$!", oldExc);
-                    } else {
-                        throw re;
-                    }
-                }
+                ioClose(runtime, port);
             }
         }
         return port;
@@ -1934,12 +1926,18 @@ public IRubyObject close() {
     // io_close
     protected static IRubyObject ioClose(Ruby runtime, IRubyObject io) {
         ThreadContext context = runtime.getCurrentContext();
+        IRubyObject closed = io.checkCallMethod(context, "closed?");
+        if (closed.isTrue()) return io;
         try {
-            return io.callMethod(runtime.getCurrentContext(), "close");
+            return io.checkCallMethod(runtime.getCurrentContext(), "close");
         } catch (RaiseException re) {
-            // ignore
-            context.setErrorInfo(context.nil);
-            return context.nil;
+            if (re.getMessage().contains(CLOSED_STREAM_MSG)) {
+                // ignore
+                context.setErrorInfo(context.nil);
+                return context.nil;
+            } else {
+                throw re;
+            }
         }
     }
 
@@ -3256,7 +3254,7 @@ public RubyIO to_io() {
 
     @Override
     public String toString() {
-        return "RubyIO(" + openFile.getMode() + ", " + openFile.fd().bestFileno() + ")";
+        return inspect().toString();
     }
 
     /* class methods for IO */

diff --git a/core/src/main/java/org/jruby/ext/stringio/StringIO.java b/core/src/main/java/org/jruby/ext/stringio/StringIO.java
@@ -1278,7 +1278,7 @@ private void checkFinalized() {
 
     private void checkOpen() {
         if (closed()) {
-            throw getRuntime().newIOError("closed stream");
+            throw getRuntime().newIOError(RubyIO.CLOSED_STREAM_MSG);
         }
     }
 }
diff --git a/core/src/main/java/org/jruby/util/io/OpenFile.java b/core/src/main/java/org/jruby/util/io/OpenFile.java
@@ -434,7 +434,7 @@ public boolean waitWritable(ThreadContext context, long timeout) {
 
         if (posix.errno == null) return false;
 
-        if (fd == null) throw runtime.newIOError("closed stream");
+        if (fd == null) throw runtime.newIOError(RubyIO.CLOSED_STREAM_MSG);
 
         switch (posix.errno) {
             case EINTR:
@@ -461,7 +461,7 @@ public boolean waitReadable(ThreadContext context, long timeout) {
 
         if (posix.errno == null) return false;
 
-        if (fd == null) throw runtime.newIOError("closed stream");
+        if (fd == null) throw runtime.newIOError(RubyIO.CLOSED_STREAM_MSG);
 
         switch (posix.errno) {
             case EINTR:
@@ -665,7 +665,7 @@ public void checkWritable(ThreadContext context) {
 
     public void checkClosed() {
         if (fd == null) {
-            throw runtime.newIOError("closed stream");
+            throw runtime.newIOError(RubyIO.CLOSED_STREAM_MSG);
         }
     }
 
@@ -1369,7 +1369,7 @@ public static int readInternal(ThreadContext context, OpenFile fptr, ChannelFD f
      */
     boolean waitReadable(ThreadContext context, ChannelFD fd) {
         if (fd == null) {
-            throw context.runtime.newIOError("closed stream");
+            throw context.runtime.newIOError(RubyIO.CLOSED_STREAM_MSG);
         }
 
         boolean locked = lock();
@@ -2280,7 +2280,7 @@ IRubyObject finishWriteconv(ThreadContext context, boolean noalloc) {
                             }
                             if (waitWritable(context)) {
                                 if (fd == null)
-                                    return noalloc ? runtime.getTrue() : runtime.newIOError("closed stream").getException();
+                                    return noalloc ? runtime.getTrue() : runtime.newIOError(RubyIO.CLOSED_STREAM_MSG).getException();
                                 continue retry;
                             }
                             break retry;

diff --git a/test/mri/excludes/TestParse.rb b/test/mri/excludes/TestParse.rb
@@ -5,6 +5,8 @@
 exclude :test_here_document, "needs investigation"
 exclude :test_invalid_char, "needs investigation"
 exclude :test_method_block_location, "needs investigation"
+exclude :test_named_capture_conflict, "missing warning in parser (#2147)"
 exclude :test_question, "needs investigation"
+exclude :test_unused_variable, "missing warning in parser (#2147)"
 exclude :test_void_expr_stmts_value, "1; next; 2 is figured via compile.c.  IR can do equivalent for 9k.  Not a huge issue for 1.7.x barring real issue"
 exclude :test_xstring, "needs investigation"