7090844: Support a timezone whose offset is changed more than once in the future

Reviewed-by: okutsu
This commit is contained in:
Yuka Kamiya 2011-09-15 14:45:35 +09:00
parent 6624a6c8d1
commit 3674ebe6e6

View File

@ -76,8 +76,8 @@ class Mappings {
// If the GMT offset of this Zone will change in some // If the GMT offset of this Zone will change in some
// future time, this Zone is added to the exclude list. // future time, this Zone is added to the exclude list.
boolean isExcluded = false; boolean isExcluded = false;
if (zone.size() > 1) { for (int i = 0; i < zone.size(); i++) {
ZoneRec zrec = zone.get(zone.size()-2); ZoneRec zrec = zone.get(i);
if ((zrec.getGmtOffset() != rawOffset) if ((zrec.getGmtOffset() != rawOffset)
&& (zrec.getUntilTime(0) > Time.getCurrentTime())) { && (zrec.getUntilTime(0) > Time.getCurrentTime())) {
if (excludeList == null) { if (excludeList == null) {
@ -85,6 +85,7 @@ class Mappings {
} }
excludeList.add(zone.getName()); excludeList.add(zone.getName());
isExcluded = true; isExcluded = true;
break;
} }
} }