summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Rowe <erowe@google.com>2013-09-10 19:50:51 -0700
committerEric Rowe <erowe@google.com>2013-09-10 20:05:28 -0700
commit0e3dec57d860065cde67d9ffd51d39b4ef175c46 (patch)
treeed3e4243f7951c1e77702bfdf5d83d71bbd3421a
parent03f48b550e2e283532830063657cf2483924f1c7 (diff)
downloadloganalysis-0e3dec57d860065cde67d9ffd51d39b4ef175c46.tar.gz
Fix NPE in LogAnalyzer
Change-Id: I9789be674d020d0ac04b375affbda17fa5353ecd
-rw-r--r--src/com/android/loganalysis/LogAnalyzer.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/loganalysis/LogAnalyzer.java b/src/com/android/loganalysis/LogAnalyzer.java
index 6fba6b9..140ac6d 100644
--- a/src/com/android/loganalysis/LogAnalyzer.java
+++ b/src/com/android/loganalysis/LogAnalyzer.java
@@ -26,6 +26,8 @@ import com.android.loganalysis.util.config.ArgsOptionParser;
import com.android.loganalysis.util.config.ConfigurationException;
import com.android.loganalysis.util.config.Option;
+import org.json.JSONObject;
+
import java.io.BufferedReader;
import java.io.Closeable;
import java.io.File;
@@ -139,7 +141,11 @@ public class LogAnalyzer {
* Print an {@link IItem} to stdout.
*/
private void printJson(IItem item) {
- System.out.println(item.toJson().toString());
+ if (item != null && item.toJson() != null) {
+ System.out.println(item.toJson().toString());
+ } else {
+ System.out.println(new JSONObject().toString());
+ }
}
/**