Switch order of equals comparison

Treiblesschorle · ctrueden · commit b407217a673e · 2019-04-18T12:02:50.000-05:00
The variable toTypeArg may be null, hence this may throw an NPE.

Furthermore, fixes bug: for isAssignable(List&lt;Number&gt;, List&lt;T&gt;) with T
extends Number, true was returned. However, this assignment is not
allowed.
diff --git a/src/main/java/org/scijava/util/Types.java b/src/main/java/org/scijava/util/Types.java
@@ -1783,7 +1783,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
`@@ -1783,7 +1783,7 @@ private static boolean isAssignable(final Type type,`
`1783`	`1783`	`// parameters must either be absent from the subject type, within`
`1784`	`1784`	`// the bounds of the wildcard type, or be an exact match to the`
`1785`	`1785`	`// parameters of the target type.`
`1786`		`- if (fromTypeArg != null && !toTypeArg.equals(fromTypeArg) &&`
	`1786`	`+ if (fromTypeArg != null && !fromTypeArg.equals(toTypeArg) &&`
`1787`	`1787`	`!(toTypeArg instanceof WildcardType && isAssignable(fromTypeArg,`
`1788`	`1788`	`toTypeArg, typeVarAssigns)))`
`1789`	`1789`	`{`