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