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

8317443: StackOverflowError on calling ListFormat::getInstance() for Norwegian locales

Browse source 
Reviewed-by: joehw
This commit is contained in:
Naoto Sato 2023-10-05 23:06:20 +00:00
parent a1c9587c27
commit 8a30c2a9b2
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -849,19 +849,20 @@ public class LocaleResources {
ResourceReference data = cache.get(cacheKey);
if (data == null || ((lpArray = (String[]) data.get()) == null)) {
ResourceBundle rb = localeData.getDateFormatData(locale);
lpArray = rb.getStringArray("ListPatterns_" + typeStr + (style == ListFormat.Style.FULL ? "" : "-" + styleStr));
var rbKey = "ListPatterns_" + typeStr + (style == ListFormat.Style.FULL ? "" : "-" + styleStr);
lpArray = localeData.getDateFormatData(locale).getStringArray(rbKey);
if (lpArray[0].isEmpty() || lpArray[1].isEmpty() || lpArray[2].isEmpty()) {
var adapter = LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR);
if (adapter instanceof ResourceBundleBasedAdapter rbba) {
if (LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR)
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];
if (!candList.isEmpty()) {
for (var p : candList.subList(1, candList.size())) {
var parentPatterns = localeData.getDateFormatData(p).getStringArray(rbKey);
for (int i = 0; i < 3; i++) { // exclude optional ones, ie, "two"/"three"
if (lpArray[i].isEmpty()) {
lpArray[i] = parentPatterns[i];
}
}
}
}