Types: fix NPE in isAssignable method

ctrueden · ctrueden · commit eb8e5700b2c8 · 2019-04-12T16:23:27.000-05:00
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
@@ -1416,7 +1416,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
`@@ -1416,7 +1416,7 @@ private static boolean isAssignable(final Type type,`
`1416`	`1416`	`// parameters must either be absent from the subject type, within`
`1417`	`1417`	`// the bounds of the wildcard type, or be an exact match to the`
`1418`	`1418`	`// parameters of the target type.`
`1419`		`- if (fromTypeArg != null && !toTypeArg.equals(fromTypeArg) &&`
	`1419`	`+ if (fromTypeArg != null && !fromTypeArg.equals(toTypeArg) &&`
`1420`	`1420`	`!(toTypeArg instanceof WildcardType && isAssignable(fromTypeArg,`
`1421`	`1421`	`toTypeArg, typeVarAssigns)))`
`1422`	`1422`	`{`