OpenJDK / jdk8u / jdk8u / jdk
changeset 9224:4024da4d22ec
8037180: [TEST_BUG] test/sun/util/calendar/zi/Zoneinfo.java incorrectly calculates raw GMT offset change time
Reviewed-by: coffeys, okutsu
author | aefimov |
---|---|
date | Fri, 14 Mar 2014 15:50:20 +0400 |
parents | 85ddd4bb6918 |
children | 05f86dea1341 |
files | test/sun/util/calendar/zi/Zoneinfo.java |
diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/test/sun/util/calendar/zi/Zoneinfo.java Fri Mar 14 15:49:46 2014 +0400 +++ b/test/sun/util/calendar/zi/Zoneinfo.java Fri Mar 14 15:50:20 2014 +0400 @@ -372,6 +372,7 @@ ZoneRec zrec = zone.get(zone.size()-1); tz.getOffsetIndex(zrec.getGmtOffset()); + int lastGmtOffsetValue = -1; int currentSave = 0; boolean usedZone; for (int zindex = 0; zindex < zone.size(); zindex++) { @@ -380,9 +381,12 @@ gmtOffset = zrec.getGmtOffset(); int stdOffset = zrec.getDirectSave(); + if (gmtOffset != lastGmtOffsetValue) { + tz.setRawOffset(gmtOffset, fromTime); + lastGmtOffsetValue = gmtOffset; + } // If this is the last zone record, take the last rule info. if (!zrec.hasUntil()) { - tz.setRawOffset(gmtOffset, fromTime); if (zrec.hasRuleReference()) { tz.setLastRules(zrec.getRuleRef().getLastRules()); } else if (stdOffset != 0) {