root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Avoid NPE in hasUnresolvableGenerics() 

Issue: SPR-11034
This commit is contained in:
Juergen Hoeller 2013-10-26 17:59:51 +02:00
parent 231433f540
commit 6cfbcf4f17
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-core/src/main/java/org/springframework/core/ResolvableType.java
View File

@ -365,16 +365,18 @@ public final class ResolvableType implements Serializable {
}
}
Class<?> resolved = resolve();
Type[] ifcs = resolved.getGenericInterfaces();
for (Type ifc : ifcs) {
if (ifc instanceof Class) {
if (forClass((Class) ifc).hasGenerics()) {
return true;
if (resolved != null) {
Type[] ifcs = resolved.getGenericInterfaces();
for (Type ifc : ifcs) {
if (ifc instanceof Class) {
if (forClass((Class) ifc).hasGenerics()) {
return true;
}
}
}
}
if (resolved.getGenericSuperclass() != null) {
return getSuperType().hasUnresolvableGenerics();
if (resolved.getGenericSuperclass() != null) {
return getSuperType().hasUnresolvableGenerics();
}
}
return false;
}