HHH-19605 Fix entity dirtiness logic when dealing with proxies

Author: mbellade

hibernate-core/src/main/java/org/hibernate/engine/internal/EntityEntryImpl.java

@@ -41,10 +41,8 @@
 import static org.hibernate.engine.internal.EntityEntryImpl.EnumState.PREVIOUS_STATUS;
 import static org.hibernate.engine.internal.EntityEntryImpl.EnumState.STATUS;
 import static org.hibernate.engine.internal.ManagedTypeHelper.asManagedEntity;
-import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptable;
+import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptableOrNull;
 import static org.hibernate.engine.internal.ManagedTypeHelper.asSelfDirtinessTracker;
-import static org.hibernate.engine.internal.ManagedTypeHelper.isHibernateProxy;
-import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptable;
 import static org.hibernate.engine.internal.ManagedTypeHelper.isSelfDirtinessTracker;
 import static org.hibernate.engine.internal.ManagedTypeHelper.processIfManagedEntity;
 import static org.hibernate.engine.internal.ManagedTypeHelper.processIfSelfDirtinessTracker;
@@ -56,7 +54,6 @@
 import static org.hibernate.engine.spi.Status.SAVING;
 import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
 import static org.hibernate.pretty.MessageHelper.infoString;
-import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
 
 /**
  * A base implementation of {@link EntityEntry}.
@@ -390,46 +387,31 @@ private boolean isUnequivocallyNonDirty(Object entity) {
 	}
 
 	private boolean isNonDirtyViaCustomStrategy(Object entity) {
-		if ( isPersistentAttributeInterceptable( entity ) ) {
-			final PersistentAttributeInterceptor interceptor =
-					asPersistentAttributeInterceptable( entity ).$$_hibernate_getInterceptor();
-			if ( interceptor instanceof EnhancementAsProxyLazinessInterceptor ) {
+		final var interceptable = asPersistentAttributeInterceptableOrNull( entity );
+		if ( interceptable != null ) {
+			if ( interceptable.$$_hibernate_getInterceptor() instanceof EnhancementAsProxyLazinessInterceptor interceptor
+				&& !interceptor.isInitialized() ) {
 				// we never have to check an uninitialized proxy
 				return true;
 			}
 		}
-
-		final SessionImplementor session = (SessionImplementor) getPersistenceContext().getSession();
-		final CustomEntityDirtinessStrategy customEntityDirtinessStrategy =
-				session.getFactory().getCustomEntityDirtinessStrategy();
+		final var session = (SessionImplementor) getPersistenceContext().getSession();
+		final var customEntityDirtinessStrategy = session.getFactory().getCustomEntityDirtinessStrategy();
 		return customEntityDirtinessStrategy.canDirtyCheck( entity, persister, session )
 			&& !customEntityDirtinessStrategy.isDirty( entity, persister, session );
 	}
 
 	private boolean isNonDirtyViaTracker(Object entity) {
-		final boolean uninitializedProxy;
-		if ( isPersistentAttributeInterceptable( entity ) ) {
-			final PersistentAttributeInterceptor interceptor =
-					asPersistentAttributeInterceptable( entity ).$$_hibernate_getInterceptor();
-			if ( interceptor instanceof EnhancementAsProxyLazinessInterceptor lazinessInterceptor ) {
-				return !lazinessInterceptor.hasWrittenFieldNames();
-			}
-			else {
-				uninitializedProxy = false;
+		final var interceptable = asPersistentAttributeInterceptableOrNull( entity );
+		if ( interceptable != null ) {
+			if ( interceptable.$$_hibernate_getInterceptor() instanceof EnhancementAsProxyLazinessInterceptor interceptor ) {
+				return !interceptor.hasWrittenFieldNames();
 			}
 		}
-		else if ( isHibernateProxy( entity ) ) {
-			uninitializedProxy = extractLazyInitializer( entity ).isUninitialized();
-		}
-		else {
-			uninitializedProxy = false;
-		}
-		// we never have to check an uninitialized proxy
-		return uninitializedProxy
-			|| !persister.hasCollections()
-				&& !persister.hasMutableProperties()
-				&& !asSelfDirtinessTracker( entity ).$$_hibernate_hasDirtyAttributes()
-				&& asManagedEntity( entity ).$$_hibernate_useTracker();
+		return !persister.hasCollections()
+			&& !persister.hasMutableProperties()
+			&& asManagedEntity( entity ).$$_hibernate_useTracker()
+			&& !asSelfDirtinessTracker( entity ).$$_hibernate_hasDirtyAttributes();
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/event/internal/DefaultDirtyCheckEventListener.java

@@ -15,8 +15,6 @@
 import org.hibernate.event.spi.DirtyCheckEventListener;
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.persister.collection.CollectionPersister;
-import org.hibernate.persister.entity.EntityPersister;
-
 
 /**
  * Determines if the current session holds modified state which
@@ -38,12 +36,12 @@ public class DefaultDirtyCheckEventListener implements DirtyCheckEventListener {
 
 	@Override
 	public void onDirtyCheck(DirtyCheckEvent event) throws HibernateException {
-		final EventSource session = event.getSession();
-		final PersistenceContext persistenceContext = session.getPersistenceContext();
+		final var session = event.getSession();
+		final var persistenceContext = session.getPersistenceContextInternal();
 		final var holdersByKey = persistenceContext.getEntityHoldersByKey();
 		if ( holdersByKey != null ) {
-			for ( var entry : holdersByKey.entrySet() ) {
-				if ( isEntityDirty( entry.getValue(), session ) ) {
+			for ( var holder : holdersByKey.values() ) {
+				if ( isEntityDirty( holder, session ) ) {
 					event.setDirty( true );
 					return;
 				}
@@ -61,25 +59,29 @@ public void onDirtyCheck(DirtyCheckEvent event) throws HibernateException {
 	}
 
 	private static boolean isEntityDirty(EntityHolder holder, EventSource session) {
-		final EntityEntry entityEntry = holder.getEntityEntry();
+		final var entityEntry = holder.getEntityEntry();
+		if ( entityEntry == null ) {
+			// holders with no entity entry yet cannot contain dirty entities
+			return false;
+		}
 		final Status status = entityEntry.getStatus();
 		return switch ( status ) {
 			case GONE, READ_ONLY -> false;
 			case DELETED -> true;
-			case MANAGED -> isManagedEntityDirty( holder.getManagedObject(), holder.getDescriptor(), entityEntry, session );
+			case MANAGED -> isManagedEntityDirty( holder.getEntity(), entityEntry, session );
 			case SAVING, LOADING -> throw new AssertionFailure( "Unexpected status: " + status );
 		};
 	}
 
-	private static boolean isManagedEntityDirty(
-			Object entity, EntityPersister descriptor, EntityEntry entityEntry, EventSource session) {
+	private static boolean isManagedEntityDirty(Object entity, EntityEntry entityEntry, EventSource session) {
 		if ( entityEntry.requiresDirtyCheck( entity ) ) { // takes into account CustomEntityDirtinessStrategy
-			final Object[] propertyValues =
+			final var persister = entityEntry.getPersister();
+			final var propertyValues =
 					entityEntry.getStatus() == Status.DELETED
 							? entityEntry.getDeletedState()
-							: descriptor.getValues( entity );
-			final int[] dirty =
-					descriptor.findDirty( propertyValues, entityEntry.getLoadedState(), entity, session );
+							: persister.getValues( entity );
+			final var dirty =
+					persister.findDirty( propertyValues, entityEntry.getLoadedState(), entity, session );
 			return dirty != null;
 		}
 		else {