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

HHH-14416 tolerate the user mangling the id of a removed object 

particularly in the case where this occurred as a result of identifier rollback
This commit is contained in:
Gavin King 2024-11-23 11:51:22 +01:00
parent 5675cbbb66
commit 6dd5c3f2b7
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java
View File

@ -67,9 +67,9 @@ public class DefaultFlushEntityEventListener implements FlushEntityEventListener
}
/**
* make sure user didn't mangle the id
* Make sure user didn't mangle the id.
*/
public void checkId(Object object, EntityPersister persister, Object id, SessionImplementor session)
public void checkId(Object object, EntityPersister persister, Object id, Status status, SessionImplementor session)
throws HibernateException {
if ( id instanceof DelayedPostInsertIdentifier ) {
@ -79,22 +79,17 @@ public class DefaultFlushEntityEventListener implements FlushEntityEventListener
}
final Object oid = persister.getIdentifier( object, session );
if ( id == null ) {
throw new AssertionFailure( "null id in " + persister.getEntityName()
+ " entry (don't flush the Session after an exception occurs)" );
}
//Small optimisation: always try to avoid getIdentifierType().isEqual(..) when possible.
//(However it's not safe to invoke the equals() method as it might trigger side-effects)
if ( id == oid ) {
//No further checks necessary:
return;
}
if ( !persister.getIdentifierType().isEqual( id, oid, session.getFactory() ) ) {
// Small optimisation: always try to avoid getIdentifierType().isEqual(..) when possible.
// (However it's not safe to invoke the equals() method as it might trigger side effects.)
else if ( id != oid
&& !status.isDeletedOrGone()
&& !persister.getIdentifierType().isEqual( id, oid, session.getFactory() ) ) {
throw new HibernateException( "identifier of an instance of " + persister.getEntityName()
+ " was altered from " + oid + " to " + id );
+ " was altered from " + oid + " to " + id );
}
}
@ -177,9 +172,9 @@ public class DefaultFlushEntityEventListener implements FlushEntityEventListener
}
else {
final EntityPersister persister = entry.getPersister();
checkId( entity, persister, entry.getId(), session );
checkId( entity, persister, entry.getId(), entry.getStatus(), session );
// grab its current state
Object[] values = persister.getValues( entity );
final Object[] values = persister.getValues( entity );
checkNaturalId( persister, entity, entry, values, loadedState, session );
return values;
}