rubinius · Feb 26, 2016 · Feb 26, 2016
Showing with 6 additions and 5 deletions.

+3 −2 core/io.rb

+2 −2 vm/builtin/io.cpp

+1 −1 vm/builtin/io.hpp
diff --git a/core/io.rb b/core/io.rb
@@ -81,7 +81,7 @@ class EINPROGRESSWaitWritable < Errno::EINPROGRESS
 
   class FileDescriptor
     class RIOStream
-      def self.close(io, raise_exception)
+      def self.close(io, allow_exception)
         Rubinius.primitive :rio_close
         raise PrimitiveFailure, "IO::FileDescriptor::RIOStream.close primitive failed"
       end
@@ -379,7 +379,8 @@ def close
       fd = @descriptor
 
       if fd != -1
-        RIOStream.close(@io, true)
+        # return early if this handle was promoted to a stream by a C-ext
+        return if RIOStream.close(@io, true)
         ret_code = FFI::Platform::POSIX.close(fd)
 
         if FFI.call_failed?(ret_code)

diff --git a/vm/builtin/io.cpp b/vm/builtin/io.cpp
@@ -1538,14 +1538,14 @@ namespace rubinius {
     G(rio_stream)->set_object_type(state, RIOStreamType);
   }
 
-  Object* RIOStream::close(STATE, Object* io, Object* raise_exception) {
+  Object* RIOStream::close(STATE, Object* io, Object* allow_exception) {
     // If there is a handle for this IO, and it's been promoted into
     // a lowlevel RIO struct using fdopen, then we MUST use fclose
     // to close it.
 
     if(capi::Handle* hdl = io->handle(state)) {
       if(hdl->is_rio()) {
-        if(!hdl->rio_close() && CBOOL(raise_exception)) {
+        if(!hdl->rio_close() && CBOOL(allow_exception)) {
           Exception::errno_error(state);
         }
         return cTrue;

diff --git a/vm/builtin/io.hpp b/vm/builtin/io.hpp
@@ -250,7 +250,7 @@ namespace rubinius {
     static void init(STATE);
 
     // Rubinius.primitive :rio_close
-    static Object* close(STATE, Object* io, Object* raise_exception);
+    static Object* close(STATE, Object* io, Object* allow_exception);
 
     class Info : public TypeInfo {
     public: