30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User aefimov
|
||
|
|
# Date 1419878542 -10800
|
||
|
|
# Mon Dec 29 21:42:22 2014 +0300
|
||
|
|
# Node ID 189490f29d1e335a2b7d162a0260d961a729652c
|
||
|
|
# Parent c8a71253d6e291112e62551b8dfc859e15dd9503
|
||
|
|
# https://hg.openjdk.org/jdk8u/jdk8u-dev/jdk/rev/189490f29d1e
|
||
|
|
|
||
|
|
# 8051641: Africa/Casablanca transitions is incorrectly calculated starting from 2027
|
||
|
|
|
||
|
|
# Reviewed-by: sherman
|
||
|
|
|
||
|
|
diff -r c8a71253d6e2 -r 189490f29d1e make/src/classes/build/tools/tzdb/ZoneRulesBuilder.java
|
||
|
|
--- javazic-1.8/build/tools/tzdb/ZoneRulesBuilder.java Thu Oct 23 11:42:20 2014 +0200
|
||
|
|
+++ javazic-1.8/build/tools/tzdb/ZoneRulesBuilder.java Mon Dec 29 21:42:22 2014 +0300
|
||
|
|
@@ -491,10 +491,10 @@
|
||
|
|
TZRule rule = new TZRule(year, month, dayOfMonthIndicator, dayOfWeek, time, timeEndOfDay, timeDefinition, savingAmountSecs);
|
||
|
|
if (lastRule) {
|
||
|
|
lastRuleList.add(rule);
|
||
|
|
- maxLastRuleStartYear = Math.max(startYear, maxLastRuleStartYear);
|
||
|
|
} else {
|
||
|
|
ruleList.add(rule);
|
||
|
|
}
|
||
|
|
+ maxLastRuleStartYear = Math.max(startYear, maxLastRuleStartYear);
|
||
|
|
year++;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--
|
||
|
|
cgit v0.9.2
|