Merge branch '6.1.x'

2024-05-06 20:11:56 +02:00
parent 39889744b0 05d9b52b19
commit d9ca263065
8 changed files with 73 additions and 50 deletions
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java
@@ -395,6 +395,9 @@ public abstract class SharedEntityManagerCreator {
 					else if (targetClass.isInstance(proxy)) {
 						return proxy;
 					}
+					else {
+						return this.target.unwrap(targetClass);
+					}
 				}
 				case "getOutputParameterValue" -> {
 					if (this.entityManager == null) {