From 7f2c1f447f62207aa6eb1f42d4f8f07434bd8913 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <juergen.hoeller@broadcom.com>
Date: Thu, 10 Apr 2025 18:30:45 +0200
Subject: [PATCH] Try loadClass on LinkageError in case of ClassLoader mismatch

See gh-34677
---
 .../cglib/core/ReflectUtils.java              | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java b/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
index 102f333c07..fd4077b78b 100644
--- a/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
+++ b/spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
@@ -527,15 +527,26 @@ public class ReflectUtils {
 				c = lookup.defineClass(b);
 			}
 			catch (LinkageError | IllegalAccessException ex) {
-				throw new CodeGenerationException(ex) {
-					@Override
-					public String getMessage() {
-						return "ClassLoader mismatch for [" + contextClass.getName() +
-								"]: JVM should be started with --add-opens=java.base/java.lang=ALL-UNNAMED " +
-								"for ClassLoader.defineClass to be accessible on " + loader.getClass().getName() +
-								"; consider co-locating the affected class in that target ClassLoader instead.";
+				if (ex instanceof LinkageError) {
+					// Could be a ClassLoader mismatch with the class pre-existing in a
+					// parent ClassLoader -> try loadClass before giving up completely.
+					try {
+						c = contextClass.getClassLoader().loadClass(className);
 					}
-				};
+					catch (ClassNotFoundException cnfe) {
+					}
+				}
+				if (c == null) {
+					throw new CodeGenerationException(ex) {
+						@Override
+						public String getMessage() {
+							return "ClassLoader mismatch for [" + contextClass.getName() +
+									"]: JVM should be started with --add-opens=java.base/java.lang=ALL-UNNAMED " +
+									"for ClassLoader.defineClass to be accessible on " + loader.getClass().getName() +
+									"; consider co-locating the affected class in that target ClassLoader instead.";
+						}
+					};
+				}
 			}
 			catch (Throwable ex) {
 				throw new CodeGenerationException(ex);