archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8294357: (tz) Update Timezone Data to 2022d

Browse source 
Reviewed-by: naoto, coffeys
This commit is contained in:
Yoshiki Sato 2022-09-30 12:45:35 +00:00 • committed by Naoto Sato
parent 64da8620e1
commit f01573368f
11 changed files with 50 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -582,12 +582,8 @@ public final class ZoneInfoFile {
// we can then pass in the dom = -1, dow > 0 into ZoneInfo
//
// hacking, assume the >=24 is the result of ZRB optimization for
// "last", it works for now. From tzdata2020d this hacking
// will not work for Asia/Gaza and Asia/Hebron which follow
// Palestine DST rules.
if (dom < 0 || dom >= 24 &&
!(zoneId.equals("Asia/Gaza") ||
zoneId.equals("Asia/Hebron"))) {
// "last", it works for now.
if (dom < 0 || dom >= 24) {
params[1] = -1;
params[2] = toCalendarDOW[dow];
} else {
@ -609,7 +605,6 @@ public final class ZoneInfoFile {
params[7] = 0;
} else {
// hacking: see comment above
// No need of hacking for Asia/Gaza and Asia/Hebron from tz2021e
if (dom < 0 || dom >= 24) {
params[6] = -1;
params[7] = toCalendarDOW[dow];