Dir#close no longer errors if already closed.

jruby · Dec 23, 2015 · 4cccba8 · 4cccba8
1 parent bae0a5f
commit 4cccba8
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/RubyDir.java b/core/src/main/java/org/jruby/RubyDir.java
@@ -111,12 +111,16 @@ public static RubyClass createDirClass(Ruby runtime) {
     }
 
     private final void checkDir() {
-        testFrozen("Dir");
-        update();
+        checkDirIgnoreClosed();
 
         if (!isOpen) throw getRuntime().newIOError("closed directory");
     }
 
+    private final void checkDirIgnoreClosed() {
+        testFrozen("Dir");
+        update();
+    }
+
     private void update() {
         if (snapshot == null || dir.exists() && dir.lastModified() > lastModified) {
             lastModified = dir.lastModified();
@@ -514,7 +518,7 @@ public static IRubyObject open19(ThreadContext context, IRubyObject recv, IRubyO
     @JRubyMethod(name = "close")
     public IRubyObject close() {
         // Make sure any read()s after close fail.
-        checkDir();
+        checkDirIgnoreClosed();
 
         isOpen = false;