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

8316974: ListFormat creation is unsuccessful for some of the supported Locales

Browse source 
Reviewed-by: joehw, rriggs
This commit is contained in:
Naoto Sato 2023-09-28 16:04:46 +00:00
parent 29348b3cf6
commit 3481a48571
3 changed files with 53 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/java.base/share/classes/java/text/ListFormat.java
View file

@ -513,7 +513,7 @@ public final class ListFormat extends Format {
public String toString() {
return
"""
ListFormat [locale: "%s", start: "%s", middle: "%s", end: "%s", two: "%s", three: "%s"]
ListFormat [locale: "%s", start: "%s", middle: "%s", end: "%s", two: "%s", three: "%s"]
""".formatted(locale.getDisplayName(), patterns[START], patterns[MIDDLE], patterns[END], patterns[TWO], patterns[THREE]);
}

20
src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java
View file

@ -843,7 +843,7 @@ public class LocaleResources {
String typeStr = type.toString().toLowerCase(Locale.ROOT);
String styleStr = style.toString().toLowerCase(Locale.ROOT);
String[] lpArray;
String cacheKey = LIST_PATTERN + typeStr;
String cacheKey = LIST_PATTERN + typeStr + styleStr;
removeEmptyReferences();
ResourceReference data = cache.get(cacheKey);
@ -851,9 +851,23 @@ public class LocaleResources {
if (data == null || ((lpArray = (String[]) data.get()) == null)) {
ResourceBundle rb = localeData.getDateFormatData(locale);
lpArray = rb.getStringArray("ListPatterns_" + typeStr + (style == ListFormat.Style.FULL ? "" : "-" + styleStr));
if (lpArray == null) {
cache.put(cacheKey, new ResourceReference(cacheKey, new String[5], referenceQueue));
if (lpArray[0].isEmpty() || lpArray[1].isEmpty() || lpArray[2].isEmpty()) {
var adapter = LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR);
if (adapter instanceof ResourceBundleBasedAdapter rbba) {
var candList = rbba.getCandidateLocales("", locale);
// make sure there is at least one parent locale
if (candList.size() >= 2) {
var parentPatterns = adapter.getLocaleResources(candList.get(1)).getListPatterns(type, style);
for (int i = 0; i < 3; i++) { // exclude optional ones, ie, "two"/"three"
if (lpArray[i].isEmpty()) {
lpArray[i] = parentPatterns[i];
}
}
}
}
}
cache.put(cacheKey, new ResourceReference(cacheKey, lpArray, referenceQueue));
}
return lpArray;