commit a5bfac5becddda70c76a151d838666b33374c0ef
author Kurt Partridge <kep@google.com> Wed Apr 17 20:33:25 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 17 20:33:26 2013 +0000
tree cfa0075ecfb54246562b0667c73963489bf2f340
parent 7da87f97b07bf2c84e033fb53106f9c50b6200ec
parent 4ac28ded28de7e66a25dea38126789ba00042c09

Merge "Fix NPE"

java/src/com/android/inputmethod/research/ResearchLogger.java

diff --git a/java/src/com/android/inputmethod/research/ResearchLogger.java b/java/src/com/android/inputmethod/research/ResearchLogger.java
index 4b04eb4..8f14d82 100644
--- a/java/src/com/android/inputmethod/research/ResearchLogger.java
+++ b/java/src/com/android/inputmethod/research/ResearchLogger.java
@@ -894,7 +894,7 @@
         // Check that expected word matches.
         if (oldLogUnit != null) {
             final String oldLogUnitWord = oldLogUnit.getWord();
-            if (!oldLogUnitWord.equals(expectedWord)) {
+            if (oldLogUnitWord != null && !oldLogUnitWord.equals(expectedWord)) {
                 return;
             }
         }