Skip to content

Commit c12ca88

Browse files
author
Andrey Turbanov
committedAug 31, 2023
8312521: Unused field LocaleProviderAdapter#defaultLocaleProviderAdapter could be removed
Reviewed-by: naoto
1 parent b38bcae commit c12ca88

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed
 

‎src/java.base/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java

+3-11
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,6 @@ public String getTextResourcesPackage() {
108108
*/
109109
private static final Map<Type, LocaleProviderAdapter> adapterInstances = new ConcurrentHashMap<>();
110110

111-
/**
112-
* Default fallback adapter type, which should return something meaningful in any case.
113-
* This is either CLDR or FALLBACK.
114-
*/
115-
static volatile LocaleProviderAdapter.Type defaultLocaleProviderAdapter;
116-
117111
/**
118112
* Adapter lookup cache.
119113
*/
@@ -147,13 +141,11 @@ public String getTextResourcesPackage() {
147141
}
148142
}
149143

150-
defaultLocaleProviderAdapter = Type.CLDR;
151144
if (!typeList.isEmpty()) {
152145
// bona fide preference exists
153146
if (!(typeList.contains(Type.CLDR) || typeList.contains(Type.JRE))) {
154147
// Append FALLBACK as the last resort when no ResourceBundleBasedAdapter is available.
155148
typeList.add(Type.FALLBACK);
156-
defaultLocaleProviderAdapter = Type.FALLBACK;
157149
}
158150
} else {
159151
// Default preference list.
@@ -345,10 +337,10 @@ public static Locale[] toLocaleArray(Set<String> tags) {
345337
public abstract BreakIteratorProvider getBreakIteratorProvider();
346338

347339
/**
348-
* Returns a ollatorProvider for this LocaleProviderAdapter, or null if no
349-
* ollatorProvider is available.
340+
* Returns a CollatorProvider for this LocaleProviderAdapter, or null if no
341+
* CollatorProvider is available.
350342
*
351-
* @return a ollatorProvider
343+
* @return a collatorProvider
352344
*/
353345
public abstract CollatorProvider getCollatorProvider();
354346

0 commit comments

Comments
 (0)
Please sign in to comment.