Avoid NPE in hasUnresolvableGenerics()

Issue: SPR-11034
11 years ago · 6cfbcf4f17
parent 231433f540
commit 6cfbcf4f17
1 changed files with 10 additions and 8 deletions
--- a/spring-core/src/main/java/org/springframework/core/ResolvableType.java
+++ b/spring-core/src/main/java/org/springframework/core/ResolvableType.java
@ -365,6 +365,7 @@ public final class ResolvableType implements Serializable {
 			}
 		}
 		Class<?> resolved = resolve();
+		if (resolved != null) {
 			Type[] ifcs = resolved.getGenericInterfaces();
 			for (Type ifc : ifcs) {
 				if (ifc instanceof Class) {
@ -376,6 +377,7 @@ public final class ResolvableType implements Serializable {
 			if (resolved.getGenericSuperclass() != null) {
 				return getSuperType().hasUnresolvableGenerics();
 			}
+		}
 		return false;
 	}