HHH-15699 HibernateException: Found shared references to a collection…

… when ShareCacheMode.All or ShareCacheMode.DISABLE_SELECTIVE
hibernate · Nov 22, 2022 · ff973d4 · ff973d4
1 parent d9c790c
commit ff973d4
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...n/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java b/...n/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java
@@ -102,6 +102,12 @@ public void resolveInstance(RowProcessingState rowProcessingState) {
 				if ( loadingEntityLocally != null ) {
 					entityInstance = loadingEntityLocally.getEntityInstance();
 				}
+				if ( entityInstance == null ) {
+					entityInstance = persistenceContext.getEntity( entityKey );
+					if ( entityInstance != null ) {
+						entityInstance = persistenceContext.proxyFor( entityInstance );
+					}
+				}
 			}
 			if ( entityInstance == null ) {
 				if ( referencedModelPart.isOptional() && parentAccess != null && parentAccess.getInitializedPart()