|
 |
ec4ff0 |
diff --git a/7090844.patch b/7090844.patch
|
|
|
ec4ff0 |
new file mode 100644
|
|
|
ec4ff0 |
index 0000000..fd5b531
|
|
|
ec4ff0 |
--- /dev/null
|
|
|
ec4ff0 |
+++ b/7090844.patch
|
|
|
ec4ff0 |
@@ -0,0 +1,38 @@
|
|
|
ec4ff0 |
+--- sun/tools/javazic/Mappings.java.orig 2015-04-13 12:42:30.000000000 -0400
|
|
|
ec4ff0 |
++++ sun/tools/javazic/Mappings.java 2015-04-13 12:43:32.000000000 -0400
|
|
|
ec4ff0 |
+@@ -1,5 +1,5 @@
|
|
|
ec4ff0 |
+ /*
|
|
|
ec4ff0 |
+- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
|
|
|
ec4ff0 |
++ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
|
|
|
ec4ff0 |
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
|
ec4ff0 |
+ *
|
|
|
ec4ff0 |
+ * This code is free software; you can redistribute it and/or modify it
|
|
|
ec4ff0 |
+@@ -26,9 +26,6 @@
|
|
|
ec4ff0 |
+ package sun.tools.javazic;
|
|
|
ec4ff0 |
+
|
|
|
ec4ff0 |
+ import java.util.ArrayList;
|
|
|
ec4ff0 |
+-import java.util.HashMap;
|
|
|
ec4ff0 |
+-import java.util.HashSet;
|
|
|
ec4ff0 |
+-import java.util.Iterator;
|
|
|
ec4ff0 |
+ import java.util.LinkedList;
|
|
|
ec4ff0 |
+ import java.util.List;
|
|
|
ec4ff0 |
+ import java.util.Map;
|
|
|
ec4ff0 |
+@@ -79,8 +76,8 @@
|
|
|
ec4ff0 |
+ // If the GMT offset of this Zone will change in some
|
|
|
ec4ff0 |
+ // future time, this Zone is added to the exclude list.
|
|
|
ec4ff0 |
+ boolean isExcluded = false;
|
|
|
ec4ff0 |
+- if (zone.size() > 1) {
|
|
|
ec4ff0 |
+- ZoneRec zrec = zone.get(zone.size()-2);
|
|
|
ec4ff0 |
++ for (int i = 0; i < zone.size(); i++) {
|
|
|
ec4ff0 |
++ ZoneRec zrec = zone.get(i);
|
|
|
ec4ff0 |
+ if ((zrec.getGmtOffset() != rawOffset)
|
|
|
ec4ff0 |
+ && (zrec.getUntilTime(0) > Time.getCurrentTime())) {
|
|
|
ec4ff0 |
+ if (excludeList == null) {
|
|
|
ec4ff0 |
+@@ -88,6 +85,7 @@
|
|
|
ec4ff0 |
+ }
|
|
|
ec4ff0 |
+ excludeList.add(zone.getName());
|
|
|
ec4ff0 |
+ isExcluded = true;
|
|
|
ec4ff0 |
++ break;
|
|
|
ec4ff0 |
+ }
|
|
|
ec4ff0 |
+ }
|
|
|
ec4ff0 |
+
|