|
 |
d9635e7 |
diff --git a/rebase-02.patch b/rebase-02.patch
|
|
|
d9635e7 |
new file mode 100644
|
|
|
d9635e7 |
index 0000000..0f57125
|
|
|
d9635e7 |
--- /dev/null
|
|
|
d9635e7 |
+++ b/rebase-02.patch
|
|
|
d9635e7 |
@@ -0,0 +1,36 @@
|
|
|
d9635e7 |
+--- sun/tools/javazic/Mappings.java.orig 2015-04-13 12:40:26.000000000 -0400
|
|
|
d9635e7 |
++++ sun/tools/javazic/Mappings.java 2015-04-13 12:42:11.000000000 -0400
|
|
|
d9635e7 |
+@@ -75,8 +75,10 @@
|
|
|
d9635e7 |
+ Zone zone = zones.get(zoneName);
|
|
|
d9635e7 |
+ String zonename = zone.getName();
|
|
|
d9635e7 |
+ int rawOffset = zone.get(zone.size()-1).getGmtOffset();
|
|
|
d9635e7 |
++
|
|
|
d9635e7 |
+ // If the GMT offset of this Zone will change in some
|
|
|
d9635e7 |
+ // future time, this Zone is added to the exclude list.
|
|
|
d9635e7 |
++ boolean isExcluded = false;
|
|
|
d9635e7 |
+ if (zone.size() > 1) {
|
|
|
d9635e7 |
+ ZoneRec zrec = zone.get(zone.size()-2);
|
|
|
d9635e7 |
+ if ((zrec.getGmtOffset() != rawOffset)
|
|
|
d9635e7 |
+@@ -85,7 +87,7 @@
|
|
|
d9635e7 |
+ excludeList = new ArrayList<String>();
|
|
|
d9635e7 |
+ }
|
|
|
d9635e7 |
+ excludeList.add(zone.getName());
|
|
|
d9635e7 |
+- continue;
|
|
|
d9635e7 |
++ isExcluded = true;
|
|
|
d9635e7 |
+ }
|
|
|
d9635e7 |
+ }
|
|
|
d9635e7 |
+
|
|
|
d9635e7 |
+@@ -101,9 +103,11 @@
|
|
|
d9635e7 |
+ rawOffsetsIndex.add(i, rawOffset);
|
|
|
d9635e7 |
+
|
|
|
d9635e7 |
+ Set<String> perRawOffset = new TreeSet<String>();
|
|
|
d9635e7 |
+- perRawOffset.add(zonename);
|
|
|
d9635e7 |
++ if (!isExcluded) {
|
|
|
d9635e7 |
++ perRawOffset.add(zonename);
|
|
|
d9635e7 |
++ }
|
|
|
d9635e7 |
+ rawOffsetsIndexTable.add(i, perRawOffset);
|
|
|
d9635e7 |
+- } else {
|
|
|
d9635e7 |
++ } else if (!isExcluded) {
|
|
|
d9635e7 |
+ int i = rawOffsetsIndex.indexOf(new Integer(rawOffset));
|
|
|
d9635e7 |
+ Set<String> perRawOffset = rawOffsetsIndexTable.get(i);
|
|
|
d9635e7 |
+ perRawOffset.add(zonename);
|