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