From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Sat, 13 Feb 2016 15:58:01 +0000 (+0100)
Subject: Another attempt to fix potential null dereference.
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=29574e872dee21ce6e8588294b670f836a7b50bd

Another attempt to fix potential null dereference.
---

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 5b5f9e1..140de67 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -390,7 +390,7 @@ public class DictionaryActivity extends ActionBarActivity {
                         final String searchToken = index.sortedIndexEntries.get(0).token;
                         final IndexEntry entry = index.findExact(searchToken);
                         if (entry == null || !searchToken.equals(entry.token)) {
-                            Log.e(LOG, "Couldn't find token: " + searchToken + ", " + entry.token);
+                            Log.e(LOG, "Couldn't find token: " + searchToken + ", " + (entry == null ? "null" : entry.token));
                         }
                     }
                     indexPrepFinished = true;