Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.ibm.icu.text.RuleBasedTransliterator.Data;
import com.ibm.icu.util.CaseInsensitiveString;
import com.ibm.icu.util.UResourceBundle;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
Expand All @@ -32,6 +33,7 @@
import java.util.Set;
import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;

class TransliteratorRegistry {
Expand Down Expand Up @@ -69,7 +71,13 @@ class TransliteratorRegistry {
/** Vector of public full IDs (CaseInsensitiveString objects). */
private final Set<CaseInsensitiveString> availableIDs;

private final Map<String, CaseInsensitiveString> stvStringPool;
/**
* CaseInsensitiveString refers to the key here, and thus according to the API doc of
* WeakHashMap, the value needs to be a WeakReference. We currently can't use
* `CaseInsensitiveString` as the key because IDEnumeration returns unfolded string, and we need
* to preserve the unfolded value of CaseInsensitiveString.
*/
private final Map<String, WeakReference<CaseInsensitiveString>> stvStringPool;

// ----------------------------------------------------------------------
// class Spec
Expand Down Expand Up @@ -882,7 +890,19 @@ private Transliterator instantiateEntry(
}

private CaseInsensitiveString toInternedSTVString(String key) {
return stvStringPool.computeIfAbsent(key, CaseInsensitiveString::new);
AtomicReference<CaseInsensitiveString> ref = new AtomicReference<>();
stvStringPool.compute(
key,
(k, holder) -> {
CaseInsensitiveString newValue;
if (holder == null || (newValue = holder.get()) == null) {
newValue = new CaseInsensitiveString(k);
holder = new WeakReference<>(newValue);
}
ref.set(newValue);
return holder;
});
return ref.get();
}
}

Expand Down
Loading