Properly return loaded type even if identified as reloadable

Closes gh-31668
spring-projects · Nov 24, 2023 · 8921be1 · 8921be1
1 parent 6ff75f1
commit 8921be1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...ession/src/main/java/org/springframework/expression/spel/support/StandardTypeLocator.java b/...ession/src/main/java/org/springframework/expression/spel/support/StandardTypeLocator.java
@@ -120,9 +120,10 @@ public Class<?> findType(String typeName) throws EvaluationException {
 			return cachedType;
 		}
 		Class<?> loadedType = loadType(typeName);
-		if (loadedType != null &&
-				!(this.classLoader instanceof SmartClassLoader scl && scl.isClassReloadable(loadedType))) {
-			this.typeCache.put(typeName, loadedType);
+		if (loadedType != null) {
+			if (!(this.classLoader instanceof SmartClassLoader scl && scl.isClassReloadable(loadedType))) {
+				this.typeCache.put(typeName, loadedType);
+			}
 			return loadedType;
 		}
 		throw new SpelEvaluationException(SpelMessage.TYPE_NOT_FOUND, typeName);