HHH-17019 EntityListener is not triggered for a LAZY loaded association

hibernate · Aug 3, 2023 · 35a671e · 35a671e
1 parent 1b1ed23
commit 35a671e
Showing 1 changed file with 9 additions and 4 deletions.
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
@@ -505,10 +505,15 @@ protected void resolveEntityInstance(
 			final Object existingEntity = persistenceContext.getEntity( entityKey );
 			if ( existingEntity != null ) {
 				entityInstance = existingEntity;
-				if ( existingLoadingEntry == null && isExistingEntityInitialized( existingEntity ) ) {
-					this.isInitialized = true;
-					registerReloadedEntity( rowProcessingState, existingEntity );
-					notifyResolutionListeners( entityInstance );
+				if ( existingLoadingEntry == null ) {
+					if ( isExistingEntityInitialized( existingEntity ) ) {
+						this.isInitialized = true;
+						registerReloadedEntity( rowProcessingState, existingEntity );
+						notifyResolutionListeners( entityInstance );
+					}
+					else {
+						registerLoadingEntityInstanceFromExecutionContext( rowProcessingState, entityInstance );
+					}
 				}
 			}
 			else if ( entityInstanceFromExecutionContext != null ) {