organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-15 17:56:54 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-8639 Merging #8626 TimeZone.getTimeZone and TimeZone.getDefault raise Assertion Error (r30197) to maint-4-8

Browse source 
X-SVN-Rev: 30287
This commit is contained in:
Yoshito Umaoka 2011-07-06 20:59:00 +00:00
parent 40974f3d33
commit 0b8ff62abf
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/classes/core/src/com/ibm/icu/impl/OlsonTimeZone.java
View file

@ -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);
}

3
main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java
View file

@ -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;