improve RequireLock to better match its semantic

this eventually fixes #3341 in the sense that both testcases do not produce deadlocks anymore. Sponsored by Lookout Inc.
jruby · Oct 8, 2015 · 455bcf0 · 455bcf0
1 parent ac5cf50
commit 455bcf0
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/core/src/main/java/org/jruby/runtime/load/LoadService.java b/core/src/main/java/org/jruby/runtime/load/LoadService.java
@@ -459,9 +459,7 @@ private boolean lock(String requireName) {
 
             if (lock.isHeldByCurrentThread()) return false;
 
-            lock.lock();
-
-            return true;
+            return lock.tryLock();
         }
 
         /**