[Truffle] IO#close don't close already closed io

jruby · Sep 7, 2016 · e270de2 · e270de2
1 parent 640732c
commit e270de2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/spec/truffle/tags/core/argf/close_tags.txt b/spec/truffle/tags/core/argf/close_tags.txt
@@ -1,3 +1,2 @@
 slow:ARGF.close does not close STDIN
 fails:ARGF.close does not close STDIN
-fails:ARGF.close doesn't raise an IOError if called on a closed stream
diff --git a/spec/truffle/tags/core/io/close_tags.txt b/spec/truffle/tags/core/io/close_tags.txt
@@ -1,5 +1,3 @@
-fails:IO#close does not raise anything when self was already closed
-fails:IO#close does nothing if already closed
 slow:IO#close on an IO.popen stream clears #pid
 slow:IO#close on an IO.popen stream sets $?
 slow:IO#close on an IO.popen stream waits for the child to exit
diff --git a/truffle/src/main/ruby/core/io.rb b/truffle/src/main/ruby/core/io.rb
@@ -2672,6 +2672,8 @@ def write_nonblock(data)
   end
 
   def close
+    return nil if closed?
+
     begin
       flush
     ensure