Eliminate deadlock when waiting for blocking threads.

I am not sure why this is not needed on master, but it fixes the deadlock in CI right now on 9.1.
jruby · Dec 22, 2017 · 1eaf339 · 1eaf339
1 parent 1fd8a50
commit 1eaf339
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
@@ -2036,7 +2036,12 @@ protected IRubyObject rbIoClose(Ruby runtime) {
 
             // interrupt waiting threads
             fptr.interruptBlockingThreads(context);
-            fptr.waitForBlockingThreads(context);
+            try {
+                fptr.unlock();
+                fptr.waitForBlockingThreads(context);
+            } finally {
+                fptr.lock();
+            }
             fptr.cleanup(runtime, false);
 
             if (fptr.getProcess() != null) {