Fix NPE in Marvel loader's BatchCommand (fixes #290)

Alexander Patrikalakis · Alexander Patrikalakis · commit be51ad205bfe · 2018-07-18T07:00:15.000-07:00
diff --git a/src/main/java/com/amazon/janusgraph/example/MarvelGraphFactory.java b/src/main/java/com/amazon/janusgraph/example/MarvelGraphFactory.java
@@ -203,7 +203,7 @@ public void run() {
                     command.run();
                 } catch (Throwable e) {
                     final Throwable rootCause = ExceptionUtils.getRootCause(e);
-                    final String rootCauseMessage = Optional.ofNullable(rootCause.getMessage()).orElse("");
+                    final String rootCauseMessage = Optional.ofNullable(rootCause).map(Throwable::getMessage).orElse("");
                     log.error("Error processing comic book {} {}", e.getMessage(), rootCauseMessage, e);
                 }
                 if (i++ % BATCH_SIZE == 0) {

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ public void run() {`
`203`	`203`	`command.run();`
`204`	`204`	`} catch (Throwable e) {`
`205`	`205`	`final Throwable rootCause = ExceptionUtils.getRootCause(e);`
`206`		`- final String rootCauseMessage = Optional.ofNullable(rootCause.getMessage()).orElse("");`
	`206`	`+ final String rootCauseMessage = Optional.ofNullable(rootCause).map(Throwable::getMessage).orElse("");`
`207`	`207`	`log.error("Error processing comic book {} {}", e.getMessage(), rootCauseMessage, e);`
`208`	`208`	`}`
`209`	`209`	`if (i++ % BATCH_SIZE == 0) {`