--- old/make/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java 2014-12-15 18:58:41.319403536 +0300 +++ new/make/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java 2014-12-15 18:58:41.191403538 +0300 @@ -718,7 +718,6 @@ stdOffsetNew)); stdOffset = stdOffsetNew; } - LocalDateTime zoneEnd; if (zone.year == Year.MAX_VALUE) { zoneEnd = LocalDateTime.MAX; @@ -734,6 +733,7 @@ List lastRules = null; int effectiveSavings = zone.fixedSavingsSecs; + if (zone.savingsRule != null) { List tzdbRules = rules.get(zone.savingsRule); if (tzdbRules == null) { @@ -758,8 +758,9 @@ if (endYear == Year.MAX_VALUE) { endYear = startYear; lastRules.add(new TransRule(endYear, rule)); - lastRulesStartYear = Math.max(startYear, lastRulesStartYear); } + lastRulesStartYear = Math.max(startYear, lastRulesStartYear); + } else { if (endYear == Year.MAX_VALUE) { //endYear = zoneEnd.getYear();