diff --git a/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java b/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java index 87ff39b9156..01654672abf 100644 --- a/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java +++ b/src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java @@ -108,12 +108,6 @@ public abstract class LocaleProviderAdapter { */ private static final Map adapterInstances = new ConcurrentHashMap<>(); - /** - * Default fallback adapter type, which should return something meaningful in any case. - * This is either CLDR or FALLBACK. - */ - static volatile LocaleProviderAdapter.Type defaultLocaleProviderAdapter; - /** * Adapter lookup cache. */ @@ -147,13 +141,11 @@ public abstract class LocaleProviderAdapter { } } - defaultLocaleProviderAdapter = Type.CLDR; if (!typeList.isEmpty()) { // bona fide preference exists if (!(typeList.contains(Type.CLDR) || typeList.contains(Type.JRE))) { // Append FALLBACK as the last resort when no ResourceBundleBasedAdapter is available. typeList.add(Type.FALLBACK); - defaultLocaleProviderAdapter = Type.FALLBACK; } } else { // Default preference list. @@ -345,10 +337,10 @@ public abstract class LocaleProviderAdapter { public abstract BreakIteratorProvider getBreakIteratorProvider(); /** - * Returns a ollatorProvider for this LocaleProviderAdapter, or null if no - * ollatorProvider is available. + * Returns a CollatorProvider for this LocaleProviderAdapter, or null if no + * CollatorProvider is available. * - * @return a ollatorProvider + * @return a collatorProvider */ public abstract CollatorProvider getCollatorProvider();