Move dict version check to proper place.

Change-Id: I89a5b4fa93153081b4f7a9183619cbe7c9ea01fa
main
Keisuke Kuroyanagi 2014-05-01 17:28:24 +09:00
parent 20770f4ba0
commit c3b151957c
1 changed files with 9 additions and 9 deletions

View File

@ -528,8 +528,6 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
} else if (mBinaryDictionary == null) { } else if (mBinaryDictionary == null) {
// Otherwise, load the existing dictionary. // Otherwise, load the existing dictionary.
loadBinaryDictionaryLocked(); loadBinaryDictionaryLocked();
}
mNeedsToReload = false;
if (mBinaryDictionary != null && !(isValidDictionaryLocked() if (mBinaryDictionary != null && !(isValidDictionaryLocked()
// TODO: remove the check below // TODO: remove the check below
&& matchesExpectedBinaryDictFormatVersionForThisType( && matchesExpectedBinaryDictFormatVersionForThisType(
@ -539,6 +537,8 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
// existing files if appropriate. // existing files if appropriate.
createNewDictionaryLocked(); createNewDictionaryLocked();
} }
}
mNeedsToReload = false;
} finally { } finally {
mIsReloading.set(false); mIsReloading.set(false);
} }