HHH-17329 Resolve state for query cache for initialized proxies

hibernate · Dec 1, 2023 · fc5b184 · fc5b184
1 parent 2570cbe
commit fc5b184
Showing 1 changed file with 9 additions and 1 deletion.
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
@@ -506,6 +506,14 @@ protected void resolveEntityInstance(
 			}
 			else {
 				entityInstance = proxy;
+				if ( Hibernate.isInitialized( entityInstance ) ) {
+					this.isInitialized = true;
+					registerReloadedEntity( rowProcessingState, entityInstance );
+					if ( rowProcessingState.getQueryOptions().isResultCachingEnabled() == Boolean.TRUE ) {
+						// We need to read result set values to correctly populate the query cache
+						resolveState( rowProcessingState );
+					}
+				}
 			}
 		}
 		else {
@@ -518,7 +526,7 @@ protected void resolveEntityInstance(
 						registerReloadedEntity( rowProcessingState, existingEntity );
 						notifyResolutionListeners( entityInstance );
 						if ( rowProcessingState.getQueryOptions().isResultCachingEnabled() == Boolean.TRUE ) {
-							// We still need to read result set values to correctly populate the query cache
+							// We need to read result set values to correctly populate the query cache
 							resolveState( rowProcessingState );
 						}
 					}