From 1951c0b993f0fdfc129181a049d2cb49b0214403 Mon Sep 17 00:00:00 2001
From: Marco Belladelli <marcobladel@gmail.com>
Date: Tue, 3 Sep 2024 10:48:00 +0200
Subject: [PATCH] HHH-18478 Retrieve concrete entity descriptor inside entity
 initializer's resolve state

---
 .../graph/entity/internal/EntityInitializerImpl.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java
index 6c96d88e7e..baaca02329 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java
@@ -86,6 +86,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 import static org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer.UNFETCHED_PROPERTY;
 import static org.hibernate.engine.internal.ManagedTypeHelper.asPersistentAttributeInterceptable;
 import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptable;
+import static org.hibernate.internal.util.NullnessUtil.castNonNull;
 import static org.hibernate.metamodel.mapping.ForeignKeyDescriptor.Nature.TARGET;
 import static org.hibernate.proxy.HibernateProxy.extractLazyInitializer;
 
@@ -1622,10 +1623,21 @@ public class EntityInitializerImpl extends AbstractInitializer<EntityInitializer
 		if ( rowIdAssembler != null ) {
 			rowIdAssembler.resolveState( data.getRowProcessingState() );
 		}
+		if ( data.concreteDescriptor == null ) {
+			data.concreteDescriptor = data.defaultConcreteDescriptor;
+			if ( data.concreteDescriptor == null ) {
+				data.concreteDescriptor = determineConcreteEntityDescriptor(
+						data.getRowProcessingState(),
+						castNonNull( discriminatorAssembler ),
+						entityDescriptor
+				);
+			}
+		}
 		resolveEntityState( data );
 	}
 
 	protected void resolveEntityState(EntityInitializerData data) {
+		assert data.concreteDescriptor != null;
 		final RowProcessingState rowProcessingState = data.getRowProcessingState();
 		for ( final DomainResultAssembler<?> assembler : assemblers[data.concreteDescriptor.getSubclassId()] ) {
 			if ( assembler != null ) {