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

8226876: Assertion in sun/util/locale/provider/CalendarDataUtility on Windows after JDK-8218960

Browse source 
Reviewed-by: clanger
This commit is contained in:
Naoto Sato 2019-06-28 08:48:17 -07:00
parent e81d3fa8c3
commit bb9049d3c1
2 changed files with 48 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java
View file

@ -249,9 +249,15 @@ public class CalendarDataUtility {
switch (requestID) {
case FIRST_DAY_OF_WEEK:
value = calendarDataProvider.getFirstDayOfWeek(locale);
if (value == 0) {
value = MONDAY; // default for the world ("001")
}
break;
case MINIMAL_DAYS_IN_FIRST_WEEK:
value = calendarDataProvider.getMinimalDaysInFirstWeek(locale);
if (value == 0) {
value = 1; // default for the world ("001")
}
break;
default:
throw new InternalError("invalid requestID: " + requestID);