Merge pull request #365 from Xanthorapedia/patch-1

ctrueden · web-flow · commit cf53740d74d2 · 2019-11-01T14:50:56.000-05:00
Be defensive checking menu path
diff --git a/src/main/java/org/scijava/menu/ShadowMenu.java b/src/main/java/org/scijava/menu/ShadowMenu.java
@@ -493,7 +493,7 @@ public <T> T[] toArray(final T[] a) {
 	// -- Helper methods --
 
 	private ShadowMenu addInternal(final ModuleInfo o) {
-		if (o.getMenuPath().isEmpty()) return null; // no menu
+		if (o.getMenuPath() == null || o.getMenuPath().isEmpty()) return null; // no menu
 		return addChild(o, 0);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ public <T> T[] toArray(final T[] a) {`
`493`	`493`	`// -- Helper methods --`
`494`	`494`
`495`	`495`	`private ShadowMenu addInternal(final ModuleInfo o) {`
`496`		`- if (o.getMenuPath().isEmpty()) return null; // no menu`
	`496`	`+ if (o.getMenuPath() == null \|\| o.getMenuPath().isEmpty()) return null; // no menu`
`497`	`497`	`return addChild(o, 0);`
`498`	`498`	`}`
`499`	`499`