diff options
| author |   satok <satok@google.com> | 2012-03-17 01:12:29 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2012-03-17 01:37:53 +0900 |
| commit | cbb5053b6c3bc113b3ca5441d6938ee1a23260c3 (patch) | |
| tree | 46577e531b16562e3490d800dc4ea5b204e1d016 /java/src | |
| parent | a50a34f8b417fc2abe05389aa13b80c4e812e82d (diff) | |
| download | latinime-cbb5053b6c3bc113b3ca5441d6938ee1a23260c3.tar.gz latinime-cbb5053b6c3bc113b3ca5441d6938ee1a23260c3.tar.xz latinime-cbb5053b6c3bc113b3ca5441d6938ee1a23260c3.zip | |
Fix NPE
bug: 6181736
Change-Id: I6522f19555c27f33c9ff4eaa8b2559a51a38f015
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/UserBigramDictionary.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/UserBigramDictionary.java b/java/src/com/android/inputmethod/latin/UserBigramDictionary.java index 42d3a70cd..91f84bed1 100644 --- a/java/src/com/android/inputmethod/latin/UserBigramDictionary.java +++ b/java/src/com/android/inputmethod/latin/UserBigramDictionary.java @@ -115,8 +115,16 @@ public class UserBigramDictionary extends ExpandableDictionary { @Override public boolean equals(Object bigram) { - Bigram bigram2 = (Bigram) bigram; - return (mWord1.equals(bigram2.mWord1) && mWord2.equals(bigram2.mWord2)); + if (!(bigram instanceof Bigram)) { + return false; + } + final Bigram bigram2 = (Bigram) bigram; + final boolean eq1 = + mWord1 == null ? bigram2.mWord1 == null : mWord1.equals(bigram2.mWord1); + if (!eq1) { + return false; + } + return mWord2 == null ? bigram2.mWord2 == null : mWord2.equals(bigram2.mWord2); } @Override |