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

8305113: (tz) Update Timezone Data to 2023c

Browse source 
Reviewed-by: naoto, andrew, serb
This commit is contained in:
Yoshiki Sato 2023-04-05 01:19:00 +00:00 • committed by Andrew John Hughes
parent 15fa78e6e7
commit ed9592c6e8
18 changed files with 302 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
View file

@ -617,6 +617,17 @@ public final class ZoneInfoFile {
params[8] = endRule.secondOfDay * 1000;
params[9] = toSTZTime[endRule.timeDefinition];
dstSavings = (startRule.offsetAfter - startRule.offsetBefore) * 1000;
// Note: known mismatching -> Africa/Cairo
// ZoneInfo : startDayOfWeek=5 <= Thursday
// startTime=86400000 <= 24:00
// This: startDayOfWeek=6 <= Friday
// startTime=0 <= 0:00
if (zoneId.equals("Africa/Cairo") &&
params[7] == Calendar.FRIDAY && params[8] == 0) {
params[7] = Calendar.THURSDAY;
params[8] = SECONDS_PER_DAY * 1000;
}
} else if (nTrans > 0) { // only do this if there is something in table already
if (lastyear < LASTYEAR) {
// ZoneInfo has an ending entry for 2037

6
src/java.base/share/classes/sun/util/resources/TimeZoneNames.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -845,9 +845,7 @@ public final class TimeZoneNames extends TimeZoneNamesBundle {
{"Europe/Jersey", GMTBST},
{"Europe/Kaliningrad", EET},
{"Europe/Kiev", EET},
{"Europe/Kirov", new String[] {"Kirov Standard Time", "GMT+03:00",
"Kirov Daylight Time", "GMT+03:00",
"Kirov Time", "GMT+03:00"}},
{"Europe/Kirov", MSK},
{"Europe/Lisbon", WET},
{"Europe/Ljubljana", CET},
{"Europe/London", GMTBST},