[Truffle] Fix bugs in RopeTable#getRope(String)

jruby · Apr 10, 2016 · d166ef9 · eregon · Apr 11, 2016 · chrisseaton
1 parent 0b6169c
commit d166ef9
Showing 1 changed file with 3 additions and 3 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,7 +47,7 @@ public Rope getRope(String string) {
             if (key != null) {
                 final WeakReference<Rope> ropeReference = ropesTable.get(key);
 
-                if (ropeReference != null) {
+                if (ropeReference != null && ropeReference.get() != null) {
                     return ropeReference.get();
                 }
             }
@@ -69,12 +69,12 @@ public Rope getRope(String string) {
 
             WeakReference<Rope> ropeReference = ropesTable.get(key);
 
-            if (ropeReference == null) {
+            if (ropeReference == null || ropeReference.get() == null) {
                 ropeReference = new WeakReference<>(rope);
                 ropesTable.put(key, ropeReference);
             }
 
-            return ropeReference.get();
+            return rope;
         } finally {
             lock.writeLock().unlock();
         }