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

ICU-9073 synchronize PluralRulesLoader methods that modify internal maps.

Browse source 
X-SVN-Rev: 31261
This commit is contained in:
Doug Felt 2012-01-24 22:54:11 +00:00
parent a18cc6389c
commit 2189a60f84
1 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
icu4j/main/classes/core/src/com/ibm/icu/impl/PluralRulesLoader.java
View file

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2008-2010, International Business Machines Corporation and *
* Copyright (C) 2008-2012, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -97,31 +97,41 @@ public class PluralRulesLoader {
* resource in plurals.res.
*/
private void checkBuildRulesIdMaps() {
if (localeIdToRulesId == null) {
boolean haveMap;
synchronized (this) {
haveMap = localeIdToRulesId != null;
}
if (!haveMap) {
Map<String, String> tempLocaleIdToRulesId;
Map<String, ULocale> tempRulesIdToEquivalentULocale;
try {
UResourceBundle pluralb = getPluralBundle();
UResourceBundle localeb = pluralb.get("locales");
localeIdToRulesId = new TreeMap<String, String>(); // sort for
// convenience
// of
// getAvailableULocales
rulesIdToEquivalentULocale = new HashMap<String, ULocale>(); // not
// visible
// sort for convenience of getAvailableULocales
tempLocaleIdToRulesId = new TreeMap<String, String>();
// not visible
tempRulesIdToEquivalentULocale = new HashMap<String, ULocale>();
for (int i = 0; i < localeb.getSize(); ++i) {
UResourceBundle b = localeb.get(i);
String id = b.getKey();
String value = b.getString().intern();
localeIdToRulesId.put(id, value);
tempLocaleIdToRulesId.put(id, value);
if (!rulesIdToEquivalentULocale.containsKey(value)) {
rulesIdToEquivalentULocale.put(value, new ULocale(id));
if (!tempRulesIdToEquivalentULocale.containsKey(value)) {
tempRulesIdToEquivalentULocale.put(value, new ULocale(id));
}
}
} catch (MissingResourceException e) {
localeIdToRulesId = Collections.emptyMap(); // dummy so we don't
// try again, can
// read
rulesIdToEquivalentULocale = Collections.emptyMap();
// dummy so we don't try again
tempLocaleIdToRulesId = Collections.emptyMap();
tempRulesIdToEquivalentULocale = Collections.emptyMap();
}
synchronized(this) {
localeIdToRulesId = tempLocaleIdToRulesId;
rulesIdToEquivalentULocale = tempRulesIdToEquivalentULocale;
}
}
}
@ -150,7 +160,11 @@ public class PluralRulesLoader {
* return null.
*/
public PluralRules getRulesForRulesId(String rulesId) {
PluralRules rules = rulesIdToRules.get(rulesId);
// synchronize on the map. release the lock temporarily while we build the rules.
PluralRules rules;
synchronized (rulesIdToRules) {
rules = rulesIdToRules.get(rulesId);
}
if (rules == null) {
try {
UResourceBundle pluralb = getPluralBundle();
@ -171,7 +185,9 @@ public class PluralRulesLoader {
} catch (ParseException e) {
} catch (MissingResourceException e) {
}
rulesIdToRules.put(rulesId, rules); // put even if null
synchronized (rulesIdToRules) {
rulesIdToRules.put(rulesId, rules); // put even if null
}
}
return rules;
}