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

8331932: Startup regressions in 23-b13

Browse source 
Reviewed-by: alanb, naoto, liach
This commit is contained in:
Claes Redestad 2024-05-10 08:22:46 +00:00
parent 7db6a3f0ee
commit d654124502
4 changed files with 56 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/java.base/share/classes/sun/util/locale/BaseLocale.java
View file

@ -38,7 +38,7 @@ import jdk.internal.util.StaticProperty;
import jdk.internal.vm.annotation.Stable;
import java.util.StringJoiner;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.UnaryOperator;
public final class BaseLocale {
@ -93,7 +93,7 @@ public final class BaseLocale {
// Interned BaseLocale cache
private static final ReferencedKeySet<BaseLocale> CACHE =
ReferencedKeySet.create(true, ConcurrentHashMap::new);
ReferencedKeySet.create(true, ReferencedKeySet.concurrentHashMapSupplier());
public static final String SEP = "_";
@ -164,13 +164,21 @@ public final class BaseLocale {
// "interned" instance can subsequently be used by the Locale
// instance which guarantees the locale components are properly cased/interned.
return CACHE.intern(new BaseLocale(language, script, region, variant),
(b) -> new BaseLocale(
LocaleUtils.toLowerString(b.language).intern(),
LocaleUtils.toTitleString(b.script).intern(),
LocaleUtils.toUpperString(b.region).intern(),
b.variant.intern()));
// Avoid lambdas since this may be on the bootstrap path in many locales
INTERNER);
}
public static final UnaryOperator<BaseLocale> INTERNER = new UnaryOperator<>() {
@Override
public BaseLocale apply(BaseLocale b) {
return new BaseLocale(
LocaleUtils.toLowerString(b.language).intern(),
LocaleUtils.toTitleString(b.script).intern(),
LocaleUtils.toUpperString(b.region).intern(),
b.variant.intern());
}
};
public static String convertOldISOCodes(String language) {
return switch (language) {
case "he", "iw" -> OLD_ISO_CODES ? "iw" : "he";