AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-9073 double-check that the shared variable is still null before setting it to the new object

Browse Source 
X-SVN-Rev: 31334
This commit is contained in:
Markus Scherer 2012-02-06 21:32:20 +00:00
parent 49d6e4662c
commit c113439fad
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
icu4j/main/classes/core/src/com/ibm/icu/impl/PluralRulesLoader.java
View File

@ -130,8 +130,10 @@ public class PluralRulesLoader {
}
synchronized(this) {
localeIdToRulesId = tempLocaleIdToRulesId;
rulesIdToEquivalentULocale = tempRulesIdToEquivalentULocale;
if (localeIdToRulesId == null) {
localeIdToRulesId = tempLocaleIdToRulesId;
rulesIdToEquivalentULocale = tempRulesIdToEquivalentULocale;
}
}
}
}
@ -161,11 +163,15 @@ public class PluralRulesLoader {
*/
public PluralRules getRulesForRulesId(String rulesId) {
// synchronize on the map. release the lock temporarily while we build the rules.
PluralRules rules;
PluralRules rules = null;
boolean hasRules; // Separate boolean because stored rules can be null.
synchronized (rulesIdToRules) {
rules = rulesIdToRules.get(rulesId);
hasRules = rulesIdToRules.containsKey(rulesId);
if (hasRules) {
rules = rulesIdToRules.get(rulesId); // can be null
}
}
if (rules == null) {
if (!hasRules) {
try {
UResourceBundle pluralb = getPluralBundle();
UResourceBundle rulesb = pluralb.get("rules");
@ -186,7 +192,11 @@ public class PluralRulesLoader {
} catch (MissingResourceException e) {
}
synchronized (rulesIdToRules) {
rulesIdToRules.put(rulesId, rules); // put even if null
if (rulesIdToRules.containsKey(rulesId)) {
rules = rulesIdToRules.get(rulesId);
} else {
rulesIdToRules.put(rulesId, rules); // can be null
}
}
}
return rules;