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

HHH-8374: Treat an entity wrapped by hibernate proxy equals a raw entity

This commit is contained in:
sndyuk 2014-02-28 20:06:01 +09:00 committed by Brett Meyer
parent 7f2eb1c525
commit 05c078e459
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
View File

@ -60,6 +60,8 @@ import org.hibernate.cache.CacheException;
import org.hibernate.engine.internal.NonNullableTransientDependencies; import org.hibernate.engine.internal.NonNullableTransientDependencies;
import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreLogging;
import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.proxy.HibernateProxy;
import org.hibernate.proxy.LazyInitializer;
import org.hibernate.type.Type; import org.hibernate.type.Type;
/** /**
@ -614,6 +616,12 @@ public class ActionQueue {
} }
public void unScheduleDeletion(EntityEntry entry, Object rescuedEntity) { public void unScheduleDeletion(EntityEntry entry, Object rescuedEntity) {
if ( rescuedEntity instanceof HibernateProxy ) {
LazyInitializer initializer = ( ( HibernateProxy ) rescuedEntity ).getHibernateLazyInitializer();
if ( !initializer.isUninitialized() ) {
rescuedEntity = initializer.getImplementation( session );
}
}
for ( int i = 0; i < deletions.size(); i++ ) { for ( int i = 0; i < deletions.size(); i++ ) {
EntityDeleteAction action = deletions.get( i ); EntityDeleteAction action = deletions.get( i );
if ( action.getInstance() == rescuedEntity ) { if ( action.getInstance() == rescuedEntity ) {