[Truffle] Use a finer-grained lock to control access to truffleBridge.

jruby · Mar 9, 2015 · 100802c · 100802c
1 parent 475e741
commit 100802c
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -907,12 +907,13 @@ public JITCompiler getJITCompiler() {
         return jitCompiler;
     }
 
-    public synchronized TruffleBridge getTruffleBridge() {
-        if (truffleBridge == null) {
-            truffleBridge = loadTruffleBridge();
+    public TruffleBridge getTruffleBridge() {
+        synchronized (truffleBridgeMutex) {
+            if (truffleBridge == null) {
+                truffleBridge = loadTruffleBridge();
+            }
+            return truffleBridge;
         }
-
-        return truffleBridge;
     }
 
     private TruffleBridge loadTruffleBridge() {
@@ -943,9 +944,11 @@ private TruffleBridge loadTruffleBridge() {
         return truffleBridge;
     }
 
-    public synchronized void shutdownTruffleBridge() {
-        if (truffleBridge != null) {
-            truffleBridge.shutdown();
+    public void shutdownTruffleBridge() {
+        synchronized (truffleBridgeMutex) {
+            if (truffleBridge != null) {
+                truffleBridge.shutdown();
+            }
         }
     }
 
@@ -4912,6 +4915,7 @@ public FilenoUtil getFilenoUtil() {
     private final JITCompiler jitCompiler;
 
     private TruffleBridge truffleBridge;
+    private final Object truffleBridgeMutex = new Object();
 
     // Note: this field and the following static initializer
     // must be located be in this order!