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

HHH-14409 : Fix issue with Proxies

This commit is contained in:
Andrea Boriero 2021-01-27 18:23:22 +01:00
parent 9849ea5a1f
commit 0659c9f4ce
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hibernate-core/src/main/java/org/hibernate/loader/access/BaseNaturalIdLoadAccessImpl.java
View File

@ -15,6 +15,8 @@ import org.hibernate.loader.ast.spi.NaturalIdLoadOptions;
import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.EntityMappingType;
import org.hibernate.metamodel.mapping.NaturalIdMapping; import org.hibernate.metamodel.mapping.NaturalIdMapping;
import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.proxy.HibernateProxy;
import org.hibernate.proxy.LazyInitializer;
import static org.hibernate.engine.spi.PersistenceContext.NaturalIdHelper.INVALID_NATURAL_ID_REFERENCE; import static org.hibernate.engine.spi.PersistenceContext.NaturalIdHelper.INVALID_NATURAL_ID_REFERENCE;
@ -188,7 +190,14 @@ public abstract class BaseNaturalIdLoadAccessImpl<T> implements NaturalIdLoadOpt
} }
if ( loaded != null ) { if ( loaded != null ) {
final EntityEntry entry = persistenceContext.getEntry( loaded ); final EntityEntry entry;
if ( loaded instanceof HibernateProxy ) {
LazyInitializer lazyInitializer = ( (HibernateProxy) loaded ).getHibernateLazyInitializer();
entry = persistenceContext.getEntry( lazyInitializer.getImplementation() );
}
else {
entry = persistenceContext.getEntry( loaded );
}
assert entry != null; assert entry != null;
if ( entry.getStatus() == Status.DELETED ) { if ( entry.getStatus() == Status.DELETED ) {
return null; return null;