ICU-4188 fix GMT display name lookup on IBM 1.4.2 windows JVM
X-SVN-Rev: 16704
This commit is contained in:
parent
a3927fac14
commit
9eb02b77ad
@ -142,7 +142,8 @@ public final class ZoneMeta {
|
||||
private static void createEquivMap() {
|
||||
EQUIV_MAP = new TreeMap();
|
||||
|
||||
Set valid = getValidIDs();
|
||||
// try leaving all ids as valid
|
||||
// Set valid = getValidIDs();
|
||||
|
||||
ArrayList list = new ArrayList(); // reuse this below
|
||||
|
||||
@ -150,9 +151,9 @@ public final class ZoneMeta {
|
||||
String[] z = ZoneMetaData.EQUIV[i];
|
||||
list.clear();
|
||||
for (int j=0; j<z.length; ++j) {
|
||||
if (valid.contains(z[j])) {
|
||||
// if (valid.contains(z[j])) {
|
||||
list.add(z[j]);
|
||||
}
|
||||
// }
|
||||
}
|
||||
if (list.size() > 1) {
|
||||
String[] a = (String[]) list.toArray(EMPTY);
|
||||
|
@ -521,11 +521,9 @@ public class DateFormatSymbols implements Serializable, Cloneable {
|
||||
*/
|
||||
private int _getZoneIndex(String ID)
|
||||
{
|
||||
for (int index=0; index<zoneStrings.length; index++)
|
||||
{
|
||||
if (ID.equalsIgnoreCase(zoneStrings[index][0])) return index;
|
||||
}
|
||||
|
||||
for (int index=0; index<zoneStrings.length; index++) {
|
||||
if (ID.equalsIgnoreCase(zoneStrings[index][0])) return index;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user