From 0b8ff62abfbe97d29d778137cb4ba33163998161 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Wed, 6 Jul 2011 20:59:00 +0000 Subject: [PATCH] ICU-8639 Merging #8626 TimeZone.getTimeZone and TimeZone.getDefault raise Assertion Error (r30197) to maint-4-8 X-SVN-Rev: 30287 --- main/classes/core/src/com/ibm/icu/impl/OlsonTimeZone.java | 4 +++- main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/main/classes/core/src/com/ibm/icu/impl/OlsonTimeZone.java b/main/classes/core/src/com/ibm/icu/impl/OlsonTimeZone.java index b6f319db4e1..0e4879ad3d5 100644 --- a/main/classes/core/src/com/ibm/icu/impl/OlsonTimeZone.java +++ b/main/classes/core/src/com/ibm/icu/impl/OlsonTimeZone.java @@ -444,8 +444,10 @@ public class OlsonTimeZone extends BasicTimeZone { * @param top the top-level zoneinfo resource bundle. This is used * to lookup the rule that `res' may refer to, if there is one. * @param res the resource bundle of the zone to be constructed + * @param id time zone ID */ - public OlsonTimeZone(UResourceBundle top, UResourceBundle res){ + public OlsonTimeZone(UResourceBundle top, UResourceBundle res, String id){ + super.setID(id); construct(top, res); } diff --git a/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java b/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java index af5af2ca5db..b658a49f672 100644 --- a/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java +++ b/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java @@ -501,8 +501,7 @@ public final class ZoneMeta { UResourceBundle top = UResourceBundle.getBundleInstance( ICUResourceBundle.ICU_BASE_NAME, ZONEINFORESNAME, ICUResourceBundle.ICU_DATA_CLASS_LOADER); UResourceBundle res = openOlsonResource(top, id); - z = new OlsonTimeZone(top, res); - z.setID(id); + z = new OlsonTimeZone(top, res, id); SYSTEM_ZONE_CACHE.put(id, z); }catch(Exception ex){ return null;