HHH-17594 HHH-17665 Fix proxy narrowing for delayed subtype entities

Author: mbellade

hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java

@@ -898,9 +898,14 @@ public Object proxyFor(Object impl) throws HibernateException {
 
 	@Override
 	public Object proxyFor(EntityHolder holder) throws HibernateException {
+		return proxyFor( holder, holder.getDescriptor() );
+	}
+
+	@Override
+	public Object proxyFor(EntityHolder holder, EntityPersister persister) {
 		final Object proxy = holder.getProxy();
-		return proxy != null && holder.getDescriptor().hasProxy()
-				? narrowProxy( proxy, holder.getDescriptor(), holder.getEntityKey(), holder.getEntity() )
+		return proxy != null && persister.hasProxy()
+				? narrowProxy( proxy, persister, holder.getEntityKey(), holder.getEntity() )
 				: holder.getEntity();
 	}
 

hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java

@@ -348,10 +348,20 @@ EntityEntry addEntry(
 	Object proxyFor(Object impl);
 
 	/**
-	 * Return the existing proxy associated with the given {@code EntityKey}, or the
-	 * argument (the entity associated with the key) if no proxy exists.
-	 * (slower than the form above)
+	 * Return the existing {@linkplain EntityHolder#getProxy() proxy} associated with
+	 * the given {@link EntityHolder}, or the {@linkplain EntityHolder#getEntity() entity}
+	 * if no proxy exists.
+	 */
+	Object proxyFor(EntityHolder holder, EntityPersister persister);
+
+	/**
+	 * Return the existing {@linkplain EntityHolder#getProxy() proxy} associated with
+	 * the given {@link EntityHolder}, or the {@linkplain EntityHolder#getEntity() entity}
+	 * if it contains no proxy.
+	 *
+	 * @deprecated Use {@link #proxyFor(EntityHolder, EntityPersister)} instead.
 	 */
+	@Deprecated( forRemoval = true )
 	Object proxyFor(EntityHolder holder);
 
 	/**

hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java

@@ -103,7 +103,7 @@ public void resolveInstance(RowProcessingState rowProcessingState) {
 
 				final EntityHolder holder = persistenceContext.getEntityHolder( entityKey );
 				if ( holder != null && holder.getEntity() != null ) {
-					entityInstance = persistenceContext.proxyFor( holder );
+					entityInstance = persistenceContext.proxyFor( holder, concreteDescriptor );
 				}
 			}
 			if ( entityInstance == null ) {