d9635e70eb
- Rebase to tzdata-2015c
- Egypt's spring-forward transition is at 24:00 on April's last Thursday,
not 00:00 on April's last Friday. 2015's transition will therefore be on
Thursday, April 30 at 24:00, not Friday, April 24 at 00:00. Similar fixes
apply to 2026, 2037, 2043, etc.
- Rebase javazic tool to match latest upstream OpenJDK version
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
diff --git a/rebase-02.patch b/rebase-02.patch
|
|
new file mode 100644
|
|
index 0000000..0f57125
|
|
--- /dev/null
|
|
+++ b/rebase-02.patch
|
|
@@ -0,0 +1,36 @@
|
|
+--- sun/tools/javazic/Mappings.java.orig 2015-04-13 12:40:26.000000000 -0400
|
|
++++ sun/tools/javazic/Mappings.java 2015-04-13 12:42:11.000000000 -0400
|
|
+@@ -75,8 +75,10 @@
|
|
+ Zone zone = zones.get(zoneName);
|
|
+ String zonename = zone.getName();
|
|
+ int rawOffset = zone.get(zone.size()-1).getGmtOffset();
|
|
++
|
|
+ // If the GMT offset of this Zone will change in some
|
|
+ // future time, this Zone is added to the exclude list.
|
|
++ boolean isExcluded = false;
|
|
+ if (zone.size() > 1) {
|
|
+ ZoneRec zrec = zone.get(zone.size()-2);
|
|
+ if ((zrec.getGmtOffset() != rawOffset)
|
|
+@@ -85,7 +87,7 @@
|
|
+ excludeList = new ArrayList<String>();
|
|
+ }
|
|
+ excludeList.add(zone.getName());
|
|
+- continue;
|
|
++ isExcluded = true;
|
|
+ }
|
|
+ }
|
|
+
|
|
+@@ -101,9 +103,11 @@
|
|
+ rawOffsetsIndex.add(i, rawOffset);
|
|
+
|
|
+ Set<String> perRawOffset = new TreeSet<String>();
|
|
+- perRawOffset.add(zonename);
|
|
++ if (!isExcluded) {
|
|
++ perRawOffset.add(zonename);
|
|
++ }
|
|
+ rawOffsetsIndexTable.add(i, perRawOffset);
|
|
+- } else {
|
|
++ } else if (!isExcluded) {
|
|
+ int i = rawOffsetsIndex.indexOf(new Integer(rawOffset));
|
|
+ Set<String> perRawOffset = rawOffsetsIndexTable.get(i);
|
|
+ perRawOffset.add(zonename);
|