commit 49910a9d774120479d89f537c7e1b4d43e6f153a
author Keisuke Kuroynagi <ksk@google.com> Thu Jul 04 15:13:08 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 04 15:13:09 2013 +0000
tree 231831ce2915eacf9a98dd2417138d250bcae991
parent 0933353c0c8823ec5ca1dcc5cd68014b87a6e045
parent 65db0262659562d4893e34b9e905e57c11fa3557

Merge "Fix: release lock in UserHistoryDictionary."

java/src/com/android/inputmethod/latin/UserHistoryDictionary.java

diff --git a/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java b/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java
index ca2d884..8c668b8 100644
--- a/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/UserHistoryDictionary.java
@@ -320,7 +320,11 @@
                     mUserHistoryDictionary.mBigramListLock.unlock();
                 }
             } else if (mUserHistoryDictionary.mBigramListLock.tryLock()) {
-                doWriteTaskLocked();
+                try {
+                    doWriteTaskLocked();
+                } finally {
+                    mUserHistoryDictionary.mBigramListLock.unlock();
+                }
             }
             return null;
         }