HHH-18872 Resolve concrete entity name when initializing lazy to-ones

Author: mbellade

hibernate-core/src/main/java/org/hibernate/type/EntityType.java

@@ -767,8 +767,13 @@ protected final Object resolveIdentifier(Object id, SharedSessionContractImpleme
 				getAssociatedEntityPersister( session.getFactory() )
 						.isInstrumented();
 
-		final Object proxyOrEntity =
-				session.internalLoad( getAssociatedEntityName(), id, isEager( overridingEager ), isNullable() );
+		final boolean isEager = isEager( overridingEager );
+		// If the association is lazy, retrieve the concrete type if required
+		final String entityName = isEager ? getAssociatedEntityName()
+				: getAssociatedEntityPersister( session.getFactory() ).resolveConcreteProxyTypeForId( id, session )
+						.getEntityName();
+
+		final Object proxyOrEntity = session.internalLoad( entityName, id, isEager, isNullable() );
 
 		final LazyInitializer lazyInitializer = extractLazyInitializer( proxyOrEntity );
 		if ( lazyInitializer != null ) {