From 4a57d4512e82aa05dc7a92a0686a6736ae38bfe7 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Wed, 25 Jan 2017 00:30:05 +0100
Subject: [PATCH] Reset cached ResolvableType on
 increaseNestingLevel/setContainingClass

Issue: SPR-15160
---
 .../beans/factory/config/DependencyDescriptor.java              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
index 030d748099..7d19ad3481 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
@@ -257,6 +257,7 @@ public class DependencyDescriptor extends InjectionPoint implements Serializable
 	 */
 	public void increaseNestingLevel() {
 		this.nestingLevel++;
+		this.resolvableType = null;
 		if (this.methodParameter != null) {
 			this.methodParameter.increaseNestingLevel();
 		}
@@ -270,6 +271,7 @@ public class DependencyDescriptor extends InjectionPoint implements Serializable
 	 */
 	public void setContainingClass(Class<?> containingClass) {
 		this.containingClass = containingClass;
+		this.resolvableType = null;
 		if (this.methodParameter != null) {
 			GenericTypeResolver.resolveParameterType(this.methodParameter, containingClass);
 		}
-- 
GitLab