Types: fix NPE in isAssignable method

ctrueden · ctrueden · commit f4ebec2b34aa · 2018-03-02T16:40:34.000-06:00
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
@@ -1412,7 +1412,7 @@ private static boolean isAssignable(final Type type,
 				// parameters must either be absent from the subject type, within
 				// the bounds of the wildcard type, or be an exact match to the
 				// parameters of the target type.
-				if (fromTypeArg != null && !toTypeArg.equals(fromTypeArg) &&
+				if (fromTypeArg != null && !fromTypeArg.equals(toTypeArg) &&
 					!(toTypeArg instanceof WildcardType && isAssignable(fromTypeArg,
 						toTypeArg, typeVarAssigns)))
 				{

Original file line number	Diff line number	Diff line change
`@@ -1412,7 +1412,7 @@ private static boolean isAssignable(final Type type,`
`1412`	`1412`	`// parameters must either be absent from the subject type, within`
`1413`	`1413`	`// the bounds of the wildcard type, or be an exact match to the`
`1414`	`1414`	`// parameters of the target type.`
`1415`		`- if (fromTypeArg != null && !toTypeArg.equals(fromTypeArg) &&`
	`1415`	`+ if (fromTypeArg != null && !fromTypeArg.equals(toTypeArg) &&`
`1416`	`1416`	`!(toTypeArg instanceof WildcardType && isAssignable(fromTypeArg,`
`1417`	`1417`	`toTypeArg, typeVarAssigns)))`
`1418`	`1418`	`{`