HHH-19017: Call isLazyByGraph Before Resolving Instance

hibernate · Jan 16, 2025 · 52e644a · 52e644a
1 parent da27935
commit 52e644a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...n/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java b/...n/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java
@@ -202,14 +202,14 @@ public void resolveInstance(EntityDelayedFetchInitializerData data) {
 						// Try to load a PersistentAttributeInterceptable. If we get one, we can add the lazy
 						// field to the interceptor. If we don't get one, we load the entity by unique key.
 						PersistentAttributeInterceptable persistentAttributeInterceptable = null;
-						if (getParent().isEntityInitializer()) {
+						if (getParent().isEntityInitializer() && isLazyByGraph( rowProcessingState )) {
 							final Object resolvedInstance =
-									getParent().asEntityInitializer().getResolvedInstance(rowProcessingState);
+									getParent().asEntityInitializer().getResolvedInstance( rowProcessingState );
 							persistentAttributeInterceptable =
 									ManagedTypeHelper.asPersistentAttributeInterceptableOrNull( resolvedInstance );
 						}
 
-						if (persistentAttributeInterceptable != null && isLazyByGraph( rowProcessingState )) {
+						if ( persistentAttributeInterceptable != null ) {
 							final LazyAttributeLoadingInterceptor persistentAttributeInterceptor = (LazyAttributeLoadingInterceptor) persistentAttributeInterceptable.$$_hibernate_getInterceptor();
 							persistentAttributeInterceptor.addLazyFieldByGraph( navigablePath.getLocalName() );
 							instance = UNFETCHED_PROPERTY;