archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 14:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8338897: Small startup regression remains after JDK-8309622 and JDK-8331932

Browse source 
Reviewed-by: liach, naoto
This commit is contained in:
Claes Redestad 2024-08-28 18:16:00 +00:00
parent 3d49fb8a17
commit a98ecad0a9
2 changed files with 21 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/java.base/share/classes/java/util/Locale.java
View file

@ -988,17 +988,23 @@ public final class Locale implements Cloneable, Serializable {
if (locale != null) {
return locale;
}
return LOCALE_CACHE.computeIfAbsent(baseloc, LOCALE_CREATOR);
return LocaleCache.cache(baseloc);
} else {
LocaleKey key = new LocaleKey(baseloc, extensions);
return LOCALE_CACHE.computeIfAbsent(key, LOCALE_CREATOR);
return LocaleCache.cache(key);
}
}
private static final ReferencedKeyMap<Object, Locale> LOCALE_CACHE
= ReferencedKeyMap.create(true, ReferencedKeyMap.concurrentHashMapSupplier());
private static final class LocaleCache implements Function<Object, Locale> {
private static final ReferencedKeyMap<Object, Locale> LOCALE_CACHE
= ReferencedKeyMap.create(true, ReferencedKeyMap.concurrentHashMapSupplier());
private static final Function<Object, Locale> LOCALE_CREATOR = new LocaleCache();
public static Locale cache(Object key) {
return LOCALE_CACHE.computeIfAbsent(key, LOCALE_CREATOR);
}
private static final Function<Object, Locale> LOCALE_CREATOR = new Function<>() {
@Override
public Locale apply(Object key) {
if (key instanceof BaseLocale base) {
@ -1007,7 +1013,7 @@ public final class Locale implements Cloneable, Serializable {
LocaleKey lk = (LocaleKey)key;
return new Locale(lk.base, lk.exts);
}
};
}
private static final class LocaleKey {