nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Make some usages of SparseArray thread-safe" into jb-mr1-dev

main
Tadashi G. Takaoka 2012-08-19 23:23:08 -07:00 committed by Android (Google) Code Review
parent 2cd248ee05 8ce351a827
commit cb2362cee1
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
java/src/com/android/inputmethod/latin/BinaryDictionary.java
View File

@ -64,18 +64,21 @@ public class BinaryDictionary extends Dictionary {
private final SparseArray<DicTraverseSession> mDicTraverseSessions = private final SparseArray<DicTraverseSession> mDicTraverseSessions =
new SparseArray<DicTraverseSession>(); new SparseArray<DicTraverseSession>();
// TODO: There should be a way to remove used DicTraverseSession objects from
// {@code mDicTraverseSessions}.
private DicTraverseSession getTraverseSession(int traverseSessionId) { private DicTraverseSession getTraverseSession(int traverseSessionId) {
DicTraverseSession traverseSession = mDicTraverseSessions.get(traverseSessionId); synchronized(mDicTraverseSessions) {
if (traverseSession == null) { DicTraverseSession traverseSession = mDicTraverseSessions.get(traverseSessionId);
synchronized(mDicTraverseSessions) { if (traverseSession == null) {
traverseSession = mDicTraverseSessions.get(traverseSessionId); traverseSession = mDicTraverseSessions.get(traverseSessionId);
if (traverseSession == null) { if (traverseSession == null) {
traverseSession = new DicTraverseSession(mLocale, mNativeDict); traverseSession = new DicTraverseSession(mLocale, mNativeDict);
mDicTraverseSessions.put(traverseSessionId, traverseSession); mDicTraverseSessions.put(traverseSessionId, traverseSession);
} }
} }
return traverseSession;
} }
return traverseSession;
} }
/** /**
@ -209,18 +212,20 @@ public class BinaryDictionary extends Dictionary {
} }
@Override @Override
public synchronized void close() { public void close() {
for (int i = 0; i < mDicTraverseSessions.size(); ++i) { synchronized (mDicTraverseSessions) {
final int key = mDicTraverseSessions.keyAt(i); final int sessionsSize = mDicTraverseSessions.size();
final DicTraverseSession traverseSession = mDicTraverseSessions.get(key); for (int index = 0; index < sessionsSize; ++index) {
if (traverseSession != null) { final DicTraverseSession traverseSession = mDicTraverseSessions.valueAt(index);
traverseSession.close(); if (traverseSession != null) {
traverseSession.close();
}
} }
} }
closeInternal(); closeInternal();
} }
private void closeInternal() { private synchronized void closeInternal() {
if (mNativeDict != 0) { if (mNativeDict != 0) {
closeNative(mNativeDict); closeNative(mNativeDict);
mNativeDict = 0; mNativeDict = 0;