Properly return loaded type even if identified as reloadable

jhoeller · jhoeller · commit aadf96ba9247 · 2023-11-24T23:28:57.000+01:00
Closes gh-31668 (cherry picked from commit 8921be1)
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeLocator.java b/spring-expression/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);

Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,10 @@ public Class<?> findType(String typeName) throws EvaluationException {`
`120`	`120`	`return cachedType;`
`121`	`121`	`}`
`122`	`122`	`Class<?> loadedType = loadType(typeName);`
`123`		`- if (loadedType != null &&`
`124`		`- !(this.classLoader instanceof SmartClassLoader scl && scl.isClassReloadable(loadedType))) {`
`125`		`- this.typeCache.put(typeName, loadedType);`
	`123`	`+ if (loadedType != null) {`
	`124`	`+ if (!(this.classLoader instanceof SmartClassLoader scl && scl.isClassReloadable(loadedType))) {`
	`125`	`+ this.typeCache.put(typeName, loadedType);`
	`126`	`+ }`
`126`	`127`	`return loadedType;`
`127`	`128`	`}`
`128`	`129`	`throw new SpelEvaluationException(SpelMessage.TYPE_NOT_FOUND, typeName);`