From 7457c1f7dc1601a2d629b743e5aa46eb345ffa03 Mon Sep 17 00:00:00 2001
From: "Bao.Ngo" <bao.ngo@aeris.net>
Date: Wed, 4 Dec 2024 17:15:35 +0700
Subject: [PATCH] Handle case WildcardBounds has TypeVariable: should check
 further isAssignableFrom

---
 .../java/org/springframework/core/ResolvableType.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 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 5a6fae09bb6d..3c66cd2345a3 100644
--- a/spring-core/src/main/java/org/springframework/core/ResolvableType.java
+++ b/spring-core/src/main/java/org/springframework/core/ResolvableType.java
@@ -342,15 +342,14 @@ private boolean isAssignableFrom(ResolvableType other, boolean strict,
 				return (ourBounds.isSameKind(typeBounds) &&
 						ourBounds.isAssignableFrom(typeBounds.getBounds(), matchedBefore));
 			}
-			else if (upUntilUnresolvable) {
+			if (upUntilUnresolvable || other.isUnresolvableTypeVariable()) {
 				return typeBounds.isAssignableFrom(this, matchedBefore);
 			}
-			else if (!exactMatch) {
+			if (!exactMatch) {
 				return typeBounds.isAssignableTo(this, matchedBefore);
 			}
-			else {
-				return false;
-			}
+
+			return false;
 		}
 
 		// In the form <? extends Number> is assignable to X...