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

HHH-12826 - Persist cascade of collection fails when orphan removal enabled with flush mode commit. 

(cherry picked from commit 3fe7d6e13e)
This commit is contained in:
Chris Cranford 2018-07-18 18:08:55 -04:00
parent 310ae3ea0d
commit 4fc2ce7ab7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hibernate-core/src/main/java/org/hibernate/engine/internal/Collections.java
View File

@ -10,6 +10,7 @@ import java.io.Serializable;
import org.hibernate.AssertionFailure; import org.hibernate.AssertionFailure;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
import org.hibernate.action.internal.DelayedPostInsertIdentifier;
import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.collection.spi.PersistentCollection;
import org.hibernate.engine.spi.CollectionEntry; import org.hibernate.engine.spi.CollectionEntry;
import org.hibernate.engine.spi.EntityEntry; import org.hibernate.engine.spi.EntityEntry;
@ -245,9 +246,15 @@ public final class Collections {
if ( loadedPersister != null || currentPersister != null ) { if ( loadedPersister != null || currentPersister != null ) {
// it is or was referenced _somewhere_ // it is or was referenced _somewhere_
// check if the key changed
// excludes marking key changed when the loaded key is a DelayedPostInsertIdentifier.
final boolean keyChanged = currentPersister != null
&& entry != null
&& !currentPersister.getKeyType().isEqual( entry.getLoadedKey(), entry.getCurrentKey(), factory )
&& !( entry.getLoadedKey() instanceof DelayedPostInsertIdentifier );
// if either its role changed, or its key changed // if either its role changed, or its key changed
final boolean ownerChanged = loadedPersister != currentPersister final boolean ownerChanged = loadedPersister != currentPersister || keyChanged;
|| !currentPersister.getKeyType().isEqual( entry.getLoadedKey(), entry.getCurrentKey(), factory );
if ( ownerChanged ) { if ( ownerChanged ) {
// do a check // do a check