infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-26 18:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

8206980: ZonedDateTime could not parse timezone name with zh_CN locale correctly

Browse Source 
Reviewed-by: rriggs
This commit is contained in:
Naoto Sato 2018-07-11 14:47:43 -07:00
parent 0922828415
commit fa3591db42
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java
View File

@ -130,7 +130,8 @@ public class CLDRTimeZoneNameProviderImpl extends TimeZoneNameProviderImpl {
// Fill in for the empty names.
// English names are prefilled for performance.
if (locale.getLanguage() != "en") {
if (!locale.equals(Locale.ENGLISH) &&
!locale.equals(Locale.US)) {
for (int zoneIndex = 0; zoneIndex < ret.length; zoneIndex++) {
deriveFallbackNames(ret[zoneIndex], locale);
}

15
test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java
View File

@ -49,7 +49,7 @@ import org.testng.annotations.Test;
/*
* @test
* @bug 8081022 8151876 8166875 8189784
* @bug 8081022 8151876 8166875 8189784 8206980
* @key randomness
*/
@ -156,12 +156,15 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
{"America/Chicago", "CST", none, Locale.ENGLISH, TextStyle.SHORT},
{"Asia/Taipei", "CST", preferred, Locale.ENGLISH, TextStyle.SHORT},
{"Australia/South", "ACST", preferred_s, Locale.ENGLISH, TextStyle.SHORT},
{"America/Chicago", "CDT", none, Locale.ENGLISH, TextStyle.SHORT},
{"America/Chicago", "CDT", none, Locale.ENGLISH, TextStyle.SHORT},
{"Asia/Shanghai", "CDT", preferred_s, Locale.ENGLISH, TextStyle.SHORT},
{"America/Juneau", "AKST", none, Locale.ENGLISH, TextStyle.SHORT},
{"America/Juneau", "AKDT", none, Locale.ENGLISH, TextStyle.SHORT},
{"Pacific/Honolulu", "HST", none, Locale.ENGLISH, TextStyle.SHORT},
{"America/Halifax", "AST", none, Locale.ENGLISH, TextStyle.SHORT},
{"America/Juneau", "AKST", none, Locale.ENGLISH, TextStyle.SHORT},
{"America/Juneau", "AKDT", none, Locale.ENGLISH, TextStyle.SHORT},
{"Pacific/Honolulu", "HST", none, Locale.ENGLISH, TextStyle.SHORT},
{"America/Halifax", "AST", none, Locale.ENGLISH, TextStyle.SHORT},
{"Z", "Z", none, Locale.ENGLISH, TextStyle.SHORT},
{"Z", "Z", none, Locale.US, TextStyle.SHORT},
{"Z", "Z", none, Locale.CANADA, TextStyle.SHORT},
};
}