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