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

ICU-10767 Use ConcurrentHashMap with RuleBasedBreakIterator.

Browse source 
X-SVN-Rev: 35656
This commit is contained in:
Andy Heninger 2014-04-25 19:58:47 +00:00
parent 4587ade4b5
commit db886fc4b2
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedBreakIterator.java
View file

@ -17,9 +17,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.CharacterIterator;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.ibm.icu.impl.Assert;
import com.ibm.icu.impl.CharTrie;
@ -251,8 +249,8 @@ public class RuleBasedBreakIterator extends BreakIterator {
private int fPositionInCache;
private final Map<Integer, LanguageBreakEngine> fBreakEngines =
Collections.synchronizedMap(new HashMap<Integer, LanguageBreakEngine>());
private final ConcurrentHashMap<Integer, LanguageBreakEngine> fBreakEngines =
new ConcurrentHashMap<Integer, LanguageBreakEngine>();
/**
* Dumps caches and performs other actions associated with a complete change
* in text or iteration position.
@ -1064,11 +1062,9 @@ public class RuleBasedBreakIterator extends BreakIterator {
// We have a dictionary character.
// Does an already instantiated break engine handle it?
synchronized(fBreakEngines) {
for (LanguageBreakEngine candidate : fBreakEngines.values()) {
if (candidate.handles(c, fBreakType)) {
return candidate;
}
for (LanguageBreakEngine candidate : fBreakEngines.values()) {
if (candidate.handles(c, fBreakType)) {
return candidate;
}
}
@ -1125,12 +1121,13 @@ public class RuleBasedBreakIterator extends BreakIterator {
}
if (eng != null && eng != fUnhandledBreakEngine) {
fBreakEngines.put(script, eng);
LanguageBreakEngine existingEngine = fBreakEngines.putIfAbsent(script, eng);
if (existingEngine != null) {
// There was a race & another thread was first to register an engine for this script.
// Use theirs and discard the one we just created.
eng = existingEngine;
}
// assert eng.handles(c, fBreakType);
// In the event of a race it's possible that the add() could fail
// and that two break engines of the same type will exist.
// Should be rare and pretty much harmless.
}
return eng;
}