Align locking with master here. Fixes #5081.

jruby · Mar 15, 2018 · 8f7385d · 8f7385d
1 parent eeb2ced
commit 8f7385d
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/core/src/main/java/org/jruby/util/io/OpenFile.java b/core/src/main/java/org/jruby/util/io/OpenFile.java
@@ -2638,17 +2638,14 @@ public void addBlockingThread(RubyThread thread) {
      * @param thread A thread blocking on this IO
      */
     public void removeBlockingThread(RubyThread thread) {
-        boolean locked = lock();
-        try {
-            Set<RubyThread> blockingThreads = this.blockingThreads;
+        Set<RubyThread> blockingThreads = this.blockingThreads;
 
-            if (blockingThreads == null) {
-                return;
-            }
+        if (blockingThreads == null) {
+            return;
+        }
 
+        synchronized (blockingThreads) {
             blockingThreads.remove(thread);
-        } finally {
-            if (locked) unlock();
         }
     }