From 6cfbcf4f17eb43224cbb1613c0c800a955b40260 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Sat, 26 Oct 2013 17:59:51 +0200
Subject: [PATCH] Avoid NPE in hasUnresolvableGenerics()

Issue: SPR-11034
---
 .../springframework/core/ResolvableType.java   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/core/ResolvableType.java b/spring-core/src/main/java/org/springframework/core/ResolvableType.java
index c58bd31e34..3131f3a02c 100644
--- a/spring-core/src/main/java/org/springframework/core/ResolvableType.java
+++ b/spring-core/src/main/java/org/springframework/core/ResolvableType.java
@@ -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;
 	}