Additional tweaks to remove Java 8 APIs for #4970.

jruby · Jan 22, 2018 · ee2ee7f · ee2ee7f
1 parent 7651881
commit ee2ee7f
Showing 1 changed file with 3 additions and 20 deletions.
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -4581,26 +4581,9 @@ public RubyString freezeAndDedupString(RubyString string) {
             deduped = string.strDup(this);
             deduped.setFrozen(true);
 
-            WeakReference<RubyString> weakref = new WeakReference<>(deduped);
-            WeakReference<RubyString> existing;
-            RubyString existingDeduped;
-
-            // Check if someone else beat us to it.
-            // NOTE: This still races because Map.compute* API is Java 8+.
-            while ((existing = dedupMap.putIfAbsent(deduped, weakref)) != null ) {
-
-                existingDeduped = existing.get();
-
-                if (existingDeduped != null) {
-                    deduped = existingDeduped;
-                    break;
-                }
-
-                // keep trying to put it if existing has been evacuated
-            }
-        }
-
-        if (deduped.getEncoding() != string.getEncoding()) {
+            // NOTE: This still races because Map.put/computeIfAbsent API is Java 8+.
+            dedupMap.put(deduped, new WeakReference<>(deduped));
+        } else if (deduped.getEncoding() != string.getEncoding()) {
             // if encodings don't match, new string loses; can't dedup
             // FIXME: This may never happen, if we are properly considering encoding in RubyString.hashCode
             deduped = string.strDup(this);