HHH-19857 Account for nested initialization when loading lazy property

(cherry picked from commit 2aad0da)

Author: marko-bekhta

hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

@@ -1599,7 +1599,6 @@ private Object initLazyProperties(
 
 		final var interceptor = asPersistentAttributeInterceptable( entity ).$$_hibernate_getInterceptor();
 		assert interceptor != null : "Expecting bytecode interceptor to be non-null";
-		final Set<String> initializedLazyAttributeNames = interceptor.getInitializedLazyAttributeNames();
 
 		final var lazyAttributesMetadata = getBytecodeEnhancementMetadata().getLazyAttributesMetadata();
 		final String fetchGroup = lazyAttributesMetadata.getFetchGroupName( fieldName );
@@ -1610,29 +1609,32 @@ private Object initLazyProperties(
 		try {
 			Object finalResult = null;
 			final Object[] results = lazySelect.load( id, session );
+			final Set<String> initializedLazyAttributeNames = interceptor.getInitializedLazyAttributeNames();
 			int i = 0;
 			for ( var fetchGroupAttributeDescriptor : fetchGroupAttributeDescriptors ) {
 				final String attributeName = fetchGroupAttributeDescriptor.getName();
-				final boolean previousInitialized = initializedLazyAttributeNames.contains( attributeName );
-				if ( previousInitialized ) {
-					// it's already been initialized (e.g. by a write) so we don't want to overwrite
-					i++;
-					// TODO: we should consider un-marking an attribute as dirty based on the selected value
-					// - we know the current value:
-					//   getPropertyValue( entity, fetchGroupAttributeDescriptor.getAttributeIndex() );
-					// - we know the selected value (see selectedValue below)
-					// - we can use the attribute Type to tell us if they are the same
-					// - assuming entity is a SelfDirtinessTracker we can also know if the attribute is currently
-					//   considered dirty, and if really not dirty we would do the un-marking
-					// - of course that would mean a new method on SelfDirtinessTracker to allow un-marking
+				if ( fieldName.equals( attributeName ) ) {
+					finalResult = results[i];
 				}
-				else {
-					final Object result = results[i++];
-					if ( initializeLazyProperty( fieldName, entity, entry, fetchGroupAttributeDescriptor, result ) ) {
-						finalResult = result;
-						interceptor.attributeInitialized( attributeName );
-					}
+				if ( !initializedLazyAttributeNames.contains( attributeName ) ) {
+					initializeLazyProperty(
+							entity,
+							entry,
+							results[i],
+							getPropertyIndex( attributeName ),
+							fetchGroupAttributeDescriptor.getType()
+					);
 				}
+				// if the attribute has already been initialized (e.g. by a write) we don't want to overwrite
+				i++;
+				// TODO: we should consider un-marking an attribute as dirty based on the selected value
+				// - we know the current value:
+				//   getPropertyValue( entity, fetchGroupAttributeDescriptor.getAttributeIndex() );
+				// - we know the selected value (see selectedValue below)
+				// - we can use the attribute Type to tell us if they are the same
+				// - assuming entity is a SelfDirtinessTracker we can also know if the attribute is currently
+				//   considered dirty, and if really not dirty we would do the un-marking
+				// - of course that would mean a new method on SelfDirtinessTracker to allow un-marking
 			}
 			LOG.trace( "Done initializing lazy properties" );
 			return finalResult;
@@ -1754,7 +1756,11 @@ protected boolean initializeLazyProperty(
 		return fieldName.equals( lazyPropertyNames[index] );
 	}
 
-	// Used by Hibernate Reactive
+	/**
+	 * Used by Hibernate Reactive
+	 * @deprecated
+	 */
+	@Deprecated(since = "7.2", forRemoval = true)
 	protected boolean initializeLazyProperty(
 			final String fieldName,
 			final Object entity,