jruby · Dec 13, 2015 · Dec 13, 2015
Showing with 18 additions and 4 deletions.

+4 −2 core/src/main/java/org/jruby/RubyIO.java

+12 −0 test/mri/ruby/test_io.rb

+1 −1 test/mri/socket/test_basicsocket.rb

+1 −1 test/mri/zlib/test_zlib.rb
diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
@@ -1943,14 +1943,16 @@ public boolean isClosed() {
      * <p>Closes all open resources for the IO.  It also removes
      * it from our magical all open file descriptor pool.</p>
      *
-     * @return The IO.
+     * @return The IO. Returns nil if the IO was already closed.
      *
      * MRI: rb_io_close_m
      */
     @JRubyMethod
     public IRubyObject close() {
         Ruby runtime = getRuntime();
-
+        if (isClosed()) {
+            return runtime.getNil();
+        }
         openFile.checkClosed();
         return rbIoClose(runtime);
     }

diff --git a/test/mri/ruby/test_io.rb b/test/mri/ruby/test_io.rb
@@ -3146,4 +3146,16 @@ def test_exception_at_close
       end
     end
   end
+
+  def test_close_twice
+    open(__FILE__) {|f|
+      assert_equal(nil, f.close)
+      assert_equal(nil, f.close)
+    }
+  end
+
+  def test_close_uninitialized
+    io = IO.allocate
+    assert_raise(IOError) { io.close }
+  end
 end
diff --git a/test/mri/socket/test_basicsocket.rb b/test/mri/socket/test_basicsocket.rb
@@ -9,7 +9,7 @@ def inet_stream
     sock = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
     yield sock
   ensure
-    assert_raise(IOError) {sock.close}
+    assert(sock.closed?)
   end
 
   def test_getsockopt

diff --git a/test/mri/zlib/test_zlib.rb b/test/mri/zlib/test_zlib.rb
@@ -929,7 +929,7 @@ def test_reader_wrap
         f = open(t.path)
         f.binmode
         assert_equal("foo", Zlib::GzipReader.wrap(f) {|gz| gz.read })
-        assert_raise(IOError) { f.close }
+        assert(f.closed?)
       }
     end