Apply fallback in case of any exception coming out of createClass

jhoeller · jhoeller · commit 48628194dc1c · 2025-02-18T15:41:38.000+01:00
Closes gh-34423 (cherry picked from commit 93134fd)
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
@@ -168,9 +168,9 @@ private Class<?> createClass(Enhancer enhancer, boolean fallback) {
 		try {
 			subclass = enhancer.createClass();
 		}
-		catch (CodeGenerationException ex) {
+		catch (Throwable ex) {
 			if (!fallback) {
-				throw ex;
+				throw (ex instanceof CodeGenerationException cgex ? cgex : new CodeGenerationException(ex));
 			}
 			// Possibly a package-visible @Bean method declaration not accessible
 			// in the given ClassLoader -> retry with original ClassLoader

Original file line number	Diff line number	Diff line change
`@@ -168,9 +168,9 @@ private Class<?> createClass(Enhancer enhancer, boolean fallback) {`
`168`	`168`	`try {`
`169`	`169`	`subclass = enhancer.createClass();`
`170`	`170`	`}`
`171`		`- catch (CodeGenerationException ex) {`
	`171`	`+ catch (Throwable ex) {`
`172`	`172`	`if (!fallback) {`
`173`		`- throw ex;`
	`173`	`+ throw (ex instanceof CodeGenerationException cgex ? cgex : new CodeGenerationException(ex));`
`174`	`174`	`}`
`175`	`175`	`// Possibly a package-visible @Bean method declaration not accessible`
`176`	`176`	`// in the given ClassLoader -> retry with original ClassLoader`