Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed GenericTypeResolver to consistently return null if not resolvable (SPR-8698)

Browse Source
This commit is contained in:
Juergen Hoeller
2011-10-20 11:17:42 +00:00
parent 3bd9a3e3e0
commit 36616a0c2c
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
org.springframework.core/src/main/java/org/springframework/core/GenericTypeResolver.java
View File

@@ -25,7 +25,6 @@ import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.lang.reflect.WildcardType;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -205,7 +204,7 @@ public abstract class GenericTypeResolver {
return doResolveTypeArguments(ownerClass, (Class) rawType, genericIfc);
}
}
else if (genericIfc.isAssignableFrom((Class) ifc)) {
else if (ifc != null && genericIfc.isAssignableFrom((Class) ifc)) {
return doResolveTypeArguments(ownerClass, (Class) ifc, genericIfc);
}
return null;