--- old/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java 2019-08-05 05:21:30.869753446 +0100 +++ new/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java 2019-08-05 05:21:30.553753446 +0100 @@ -573,12 +573,8 @@ // 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 tzdata2019a 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 { @@ -613,8 +609,6 @@ dstSavings = (startRule.offsetAfter - startRule.offsetBefore) * 1000; // Note: known mismatching -> Asia/Amman - // Asia/Gaza - // Asia/Hebron // ZoneInfo : startDayOfWeek=5 <= Thursday // startTime=86400000 <= 24 hours // This: startDayOfWeek=6 @@ -623,18 +617,14 @@ // its endDayOfWeek and endTime // Below is the workarounds, it probably slows down everyone a little if (params[2] == 6 && params[3] == 0 && - (zoneId.equals("Asia/Amman") || - zoneId.equals("Asia/Gaza") || - zoneId.equals("Asia/Hebron"))) { + (zoneId.equals("Asia/Amman"))) { params[2] = 5; params[3] = 86400000; } // Additional check for startDayOfWeek=6 and starTime=86400000 - // is needed for Asia/Amman; Asia/Gasa and Asia/Hebron + // is needed for Asia/Amman; if (params[2] == 7 && params[3] == 0 && - (zoneId.equals("Asia/Amman") || - zoneId.equals("Asia/Gaza") || - zoneId.equals("Asia/Hebron"))) { + (zoneId.equals("Asia/Amman"))) { params[2] = 6; // Friday params[3] = 86400000; // 24h }