Avoid NPE in hasUnresolvableGenerics()

Issue: SPR-11034
master
Juergen Hoeller 11 years ago
parent 231433f540
commit 6cfbcf4f17
  1. 18
      spring-core/src/main/java/org/springframework/core/ResolvableType.java

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

Loading…
Cancel
Save