aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2011-09-27 18:03:42 +0900
committerJean Chalard <jchalard@google.com>2011-09-27 18:03:42 +0900
commitcad25fc8a754d6f145bc846f17f270220b15c055 (patch)
treed69c727df4e83cf4ab9852c4deb1c5a421a4869f
parente76dbffe002e37dee4d5cac25af06c63257632a2 (diff)
downloadlatinime-cad25fc8a754d6f145bc846f17f270220b15c055.tar.gz
latinime-cad25fc8a754d6f145bc846f17f270220b15c055.tar.xz
latinime-cad25fc8a754d6f145bc846f17f270220b15c055.zip
Fix a bug ending in a NPE in some rare cases.
Change-Id: If8109c6aa29d100eb745f17f0af756bcb6e3cabb
-rw-r--r--tools/makedict/src/com/android/inputmethod/latin/FusionDictionary.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/makedict/src/com/android/inputmethod/latin/FusionDictionary.java b/tools/makedict/src/com/android/inputmethod/latin/FusionDictionary.java
index 031f35dfe..f6220eea2 100644
--- a/tools/makedict/src/com/android/inputmethod/latin/FusionDictionary.java
+++ b/tools/makedict/src/com/android/inputmethod/latin/FusionDictionary.java
@@ -217,7 +217,7 @@ public class FusionDictionary implements Iterable<Word> {
int nodeIndex = findIndexOfChar(mRoot, word[charIndex]);
while (CHARACTER_NOT_FOUND != nodeIndex) {
currentGroup = currentNode.mData.get(nodeIndex);
- differentCharIndex = compareArrays(currentGroup.mChars, word, charIndex) ;
+ differentCharIndex = compareArrays(currentGroup.mChars, word, charIndex);
if (ARRAYS_ARE_EQUAL != differentCharIndex
&& differentCharIndex < currentGroup.mChars.length) break;
if (null == currentGroup.mChildren) break;
@@ -268,7 +268,7 @@ public class FusionDictionary implements Iterable<Word> {
+ new String(word, 0, word.length));
}
final CharGroup newGroup = new CharGroup(word,
- currentGroup.mBigrams, frequency);
+ currentGroup.mBigrams, frequency, currentGroup.mChildren);
currentNode.mData.set(nodeIndex, newGroup);
}
} else {