commit 4ac28ded28de7e66a25dea38126789ba00042c09
author Kurt Partridge <kep@google.com> Mon Apr 15 11:10:57 2013 -0700
committer Kurt Partridge <kep@google.com> Tue Apr 16 20:39:47 2013 -0700
tree 1bb155cb0306e231ecd869aee0b8ead1b208e134
parent 3970352ea907cbea63e342f370bb0bbb9cc7335a

Fix NPE

Change-Id: I8a091fb63dab12a0d2ba69e2fe393249bc68d103

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 7a23ddb..a7dda00 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;
             }
         }