diff options
| -rw-r--r-- | src/changes/changes.xml | 2 | ||||
| -rw-r--r-- | src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 129638d74..300ee63bc 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -57,6 +57,8 @@ The <action> type attribute can be add,update,fix,remove. <action issue="LANG-1591" type="update" dev="kinow" due-to="bhawna94">Remove redundant argument from substring call.</action> <action issue="LANG-1613" type="update" dev="ggregory" due-to="Arturo Bernal, Gary Gregory">BigDecimal is created when you pass it the min and max values, #642.</action> <action issue="LANG-1541" type="update" dev="ggregory" due-to="Arturo Bernal, Gary Gregory">ArrayUtils.contains() and indexOf() fails to handle Double.NaN #647.</action> + <action issue="LANG-1541" type="update" dev="ggregory" due-to="Gary Gregory">Fix potential NPE in TypeUtils.isAssignable(Type, ParameterizedType, Map, Type>).</action> + <!-- ADDS --> <action type="add" dev="ggregory" due-to="Gary Gregory">Add BooleanUtils.booleanValues().</action> <action type="add" dev="ggregory" due-to="Gary Gregory">Add BooleanUtils.primitiveValues().</action> diff --git a/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java index 7d904213b..c28d3bdb1 100644 --- a/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java +++ b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java @@ -1221,7 +1221,7 @@ public class TypeUtils { // 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 + if (fromTypeArg != null && toTypeArg != null && !toTypeArg.equals(fromTypeArg) && !(toTypeArg instanceof WildcardType && isAssignable(fromTypeArg, toTypeArg, typeVarAssigns))) { |