HHH-19605 Fix entity dirtiness logic when dealing with proxies

Author: mbellade

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

@@ -20,12 +20,14 @@
 import org.hibernate.engine.spi.EntityKey;
 import org.hibernate.engine.spi.ManagedEntity;
 import org.hibernate.engine.spi.PersistenceContext;
+import org.hibernate.engine.spi.PersistentAttributeInterceptable;
 import org.hibernate.engine.spi.SelfDirtinessTracker;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.engine.spi.Status;
 import org.hibernate.internal.util.ImmutableBitSet;
 import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.type.TypeHelper;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -37,10 +39,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;
@@ -385,9 +385,17 @@ private boolean isUnequivocallyNonDirty(Object entity) {
 	}
 
 	private boolean isNonDirtyViaCustomStrategy(Object entity) {
-		if ( isPersistentAttributeInterceptable( entity ) ) {
-			if ( asPersistentAttributeInterceptable( entity ).$$_hibernate_getInterceptor()
-					instanceof EnhancementAsProxyLazinessInterceptor ) {
+		final PersistentAttributeInterceptable 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;
+			}
+		}
+		else {
+			final LazyInitializer lazyInitializer = extractLazyInitializer( entity );
+			if ( lazyInitializer != null && lazyInitializer.isUninitialized() ) {
 				// we never have to check an uninitialized proxy
 				return true;
 			}
@@ -400,28 +408,24 @@ private boolean isNonDirtyViaCustomStrategy(Object entity) {
 	}
 
 	private boolean isNonDirtyViaTracker(Object entity) {
-		final boolean uninitializedProxy;
-		if ( isPersistentAttributeInterceptable( entity ) ) {
-			if ( asPersistentAttributeInterceptable( entity ).$$_hibernate_getInterceptor()
-					instanceof EnhancementAsProxyLazinessInterceptor lazinessInterceptor ) {
-				return !lazinessInterceptor.hasWrittenFieldNames();
+		final PersistentAttributeInterceptable interceptable = asPersistentAttributeInterceptableOrNull( entity );
+		if ( interceptable != null ) {
+			if ( interceptable.$$_hibernate_getInterceptor() instanceof EnhancementAsProxyLazinessInterceptor interceptor ) {
+				return !interceptor.hasWrittenFieldNames();
 			}
-			else {
-				uninitializedProxy = false;
-			}
-		}
-		else if ( isHibernateProxy( entity ) ) {
-			uninitializedProxy = extractLazyInitializer( entity ).isUninitialized();
 		}
 		else {
-			uninitializedProxy = false;
+			final LazyInitializer lazyInitializer = extractLazyInitializer( entity );
+			if ( lazyInitializer != null && lazyInitializer.isUninitialized() ) {
+				// we never have to check an uninitialized proxy
+				return true;
+			}
 		}
 		// 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

@@ -16,6 +16,8 @@
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
 
+import static org.hibernate.internal.util.NullnessUtil.castNonNull;
+
 
 /**
  * Determines if the current session holds modified state which
@@ -61,22 +63,23 @@ public void onDirtyCheck(DirtyCheckEvent event) throws HibernateException {
 
 	private static boolean isEntityDirty(EntityHolder holder, EventSource session) {
 		final var entityEntry = holder.getEntityEntry();
-		final Status status = entityEntry.getStatus();
+		final Status status = castNonNull( 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, entityEntry, session );
 			case SAVING, LOADING -> throw new AssertionFailure( "Unexpected status: " + status );
 		};
 	}
 
-	private static boolean isManagedEntityDirty(
-			Object entity, EntityPersister descriptor, EntityEntry entityEntry, EventSource session) {
-		if ( entityEntry.requiresDirtyCheck( entity ) ) { // takes into account CustomEntityDirtinessStrategy
+	private static boolean isManagedEntityDirty(EntityHolder holder, EntityEntry entityEntry, EventSource session) {
+		if ( entityEntry.requiresDirtyCheck( holder.getManagedObject() ) ) { // takes into account CustomEntityDirtinessStrategy
+			final Object entity = holder.getEntity();
+			final EntityPersister descriptor = holder.getDescriptor();
 			final Object[] propertyValues =
 					entityEntry.getStatus() == Status.DELETED
 							? entityEntry.getDeletedState()
-							: descriptor.getValues( entity );
+							: descriptor.getValues( holder.getEntity() );
 			final int[] dirty =
 					descriptor.findDirty( propertyValues, entityEntry.getLoadedState(), entity, session );
 			return dirty != null;