[Truffle] Fix multiple reference gets which race in RopeTable.

jruby · Apr 15, 2016 · 45b9937 · 45b9937
1 parent 55bd814
commit 45b9937
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeTable.java b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeTable.java
@@ -47,8 +47,12 @@ public Rope getRope(String string) {
             if (key != null) {
                 final WeakReference<Rope> ropeReference = ropesTable.get(key);
 
-                if (ropeReference != null && ropeReference.get() != null) {
-                    return ropeReference.get();
+                if (ropeReference != null) {
+                    final Rope rope = ropeReference.get();
+
+                    if (rope != null) {
+                        return rope;
+                    }
                 }
             }
         } finally {