Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Marco Belladelli 2024-01-05 11:30:46 +01:00 committed by Christian Beikov
parent 8ed1e1cb40
commit 8be3a1db85
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -898,9 +898,14 @@ public class StatefulPersistenceContext implements PersistenceContext {
@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();
}

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

@ -348,10 +348,20 @@ public interface PersistenceContext {
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);
/**

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

@ -157,7 +157,7 @@ public class EntityDelayedFetchInitializer implements EntityInitializer {
final EntityKey entityKey = new EntityKey( identifier, concreteDescriptor );
final EntityHolder holder = persistenceContext.getEntityHolder( entityKey );
if ( holder != null && holder.getEntity() != null ) {
entityInstance = persistenceContext.proxyFor( holder );
entityInstance = persistenceContext.proxyFor( holder, concreteDescriptor );
}
// For primary key based mappings we only use bytecode-laziness if the attribute is optional,
// because the non-optionality implies that it is safe to have a proxy