HHH-16334 Persist and load an entity with an all-delete-orphan collec…

…tion null
hibernate · Mar 24, 2023 · b6fa9c1 · b6fa9c1
1 parent 6c9d966
commit b6fa9c1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 21 deletions.
diff --git a/...va/org/hibernate/sql/results/graph/collection/internal/AbstractCollectionInitializer.java b/...va/org/hibernate/sql/results/graph/collection/internal/AbstractCollectionInitializer.java
@@ -21,6 +21,7 @@
 import org.hibernate.sql.results.graph.collection.CollectionInitializer;
 import org.hibernate.sql.results.graph.collection.CollectionLoadingLogger;
 import org.hibernate.sql.results.graph.collection.LoadingCollectionEntry;
+import org.hibernate.sql.results.graph.entity.EntityInitializer;
 import org.hibernate.sql.results.jdbc.spi.RowProcessingState;
 
 /**
@@ -91,6 +92,12 @@ public void resolveKey(RowProcessingState rowProcessingState) {
 
 	protected void resolveInstance(RowProcessingState rowProcessingState, boolean isEager) {
 		if ( collectionKey != null ) {
+			if ( parentAccess != null ) {
+				final EntityInitializer parentEntityInitializer = parentAccess.findFirstEntityInitializer();
+				if ( parentEntityInitializer != null && parentEntityInitializer.isEntityInitialized() ) {
+					return;
+				}
+			}
 			final SharedSessionContractImplementor session = rowProcessingState.getSession();
 			final PersistenceContext persistenceContext = session.getPersistenceContext();
 			final FetchParentAccess fetchParentAccess = parentAccess.findFirstEntityDescriptorAccess();

diff --git a/...ava/org/hibernate/sql/results/graph/collection/internal/DelayedCollectionInitializer.java b/...ava/org/hibernate/sql/results/graph/collection/internal/DelayedCollectionInitializer.java
@@ -11,7 +11,6 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.results.graph.DomainResultAssembler;
 import org.hibernate.sql.results.graph.FetchParentAccess;
-import org.hibernate.sql.results.graph.entity.EntityInitializer;
 import org.hibernate.sql.results.jdbc.spi.RowProcessingState;
 
 /**
@@ -30,12 +29,6 @@ public DelayedCollectionInitializer(
 
 	@Override
 	public void resolveInstance(RowProcessingState rowProcessingState) {
-		if ( parentAccess != null ) {
-			final EntityInitializer parentEntityInitializer = parentAccess.findFirstEntityInitializer();
-			if ( parentEntityInitializer != null && parentEntityInitializer.isEntityInitialized() ) {
-				return;
-			}
-		}
 		resolveInstance( rowProcessingState, false );
 	}
 

diff --git a/...-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityInitializer.java b/...-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityInitializer.java
@@ -9,6 +9,7 @@
 import java.util.Collection;
 import java.util.function.Consumer;
 
+import org.hibernate.Hibernate;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.StaleObjectStateException;
@@ -41,7 +42,6 @@
 import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.property.access.internal.PropertyAccessStrategyBackRefImpl;
-import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.proxy.map.MapProxy;
 import org.hibernate.spi.NavigablePath;
@@ -563,18 +563,7 @@ private boolean isProxyInstance(Object proxy) {
 	}
 
 	private boolean isExistingEntityInitialized(Object existingEntity) {
-		final LazyInitializer lazyInitializer = HibernateProxy.extractLazyInitializer( entityInstance );
-		if ( lazyInitializer != null ) {
-			return !lazyInitializer.isUninitialized();
-		}
-		else if ( isPersistentAttributeInterceptable( existingEntity ) ) {
-			final PersistentAttributeInterceptor persistentAttributeInterceptor =
-					asPersistentAttributeInterceptable( entityInstance ).$$_hibernate_getInterceptor();
-			return persistentAttributeInterceptor != null
-				&& !( persistentAttributeInterceptor instanceof EnhancementAsProxyLazinessInterceptor );
-		}
-
-		return true;
+		return Hibernate.isInitialized( existingEntity );
 	}
 
 	/**

diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/InitializersList.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/InitializersList.java
@@ -14,6 +14,7 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.exec.spi.ExecutionContext;
 import org.hibernate.sql.results.graph.Initializer;
+import org.hibernate.sql.results.graph.collection.internal.AbstractCollectionInitializer;
 import org.hibernate.sql.results.graph.entity.internal.EntityDelayedFetchInitializer;
 import org.hibernate.sql.results.graph.entity.internal.EntitySelectFetchInitializer;
 import org.hibernate.sql.results.jdbc.spi.RowProcessingState;
@@ -115,7 +116,9 @@ public void addInitializer(final Initializer initializer) {
 		}
 
 		private static boolean initializeFirst(final Initializer initializer) {
-			return !( initializer instanceof EntityDelayedFetchInitializer ) && !( initializer instanceof EntitySelectFetchInitializer );
+			return !( initializer instanceof EntityDelayedFetchInitializer )
+					&& !( initializer instanceof EntitySelectFetchInitializer )
+					&& !( initializer instanceof AbstractCollectionInitializer );
 		}
 
 		InitializersList build(final Map<NavigablePath, Initializer> initializerMap) {