commit cad25fc8a754d6f145bc846f17f270220b15c055
author Jean Chalard <jchalard@google.com> Tue Sep 27 18:03:42 2011 +0900
committer Jean Chalard <jchalard@google.com> Tue Sep 27 18:03:42 2011 +0900
tree d69c727df4e83cf4ab9852c4deb1c5a421a4869f
parent e76dbffe002e37dee4d5cac25af06c63257632a2

Fix a bug ending in a NPE in some rare cases.

Change-Id: If8109c6aa29d100eb745f17f0af756bcb6e3cabb

tools/makedict/src/com/android/inputmethod/latin/FusionDictionary.java

diff --git a/tools/makedict/src/com/android/inputmethod/latin/FusionDictionary.java b/tools/makedict/src/com/android/inputmethod/latin/FusionDictionary.java
index 031f35d..f6220ee 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 @@
         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 @@
                                     + 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 {