am a5bfac5b: Merge "Fix NPE"

* commit 'a5bfac5becddda70c76a151d838666b33374c0ef':
  Fix NPE
main
Kurt Partridge 2013-04-17 13:36:09 -07:00 committed by Android Git Automerger
commit f5864fbb7a
1 changed files with 1 additions and 1 deletions

View File

@ -894,7 +894,7 @@ public class ResearchLogger implements SharedPreferences.OnSharedPreferenceChang
// Check that expected word matches. // Check that expected word matches.
if (oldLogUnit != null) { if (oldLogUnit != null) {
final String oldLogUnitWord = oldLogUnit.getWord(); final String oldLogUnitWord = oldLogUnit.getWord();
if (!oldLogUnitWord.equals(expectedWord)) { if (oldLogUnitWord != null && !oldLogUnitWord.equals(expectedWord)) {
return; return;
} }
} }