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

HHH-7304 bugfix proposal

This commit is contained in:
Guenther Demetz 2012-05-09 16:42:39 +02:00 committed by Brett Meyer
parent f58557a567
commit a407665819
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java
View File

@ -72,7 +72,9 @@ public abstract class AbstractEntityInsertAction extends EntityAction {
this.isExecuted = false; this.isExecuted = false;
this.areTransientReferencesNullified = false; this.areTransientReferencesNullified = false;
handleNaturalIdPreSaveNotifications(); if (id != null) {
handleNaturalIdPreSaveNotifications();
}
} }
/** /**
@ -193,7 +195,17 @@ public abstract class AbstractEntityInsertAction extends EntityAction {
/** /**
* Handle sending notifications needed for natural-id after saving * Handle sending notifications needed for natural-id after saving
*/ */
protected void handleNaturalIdPostSaveNotifications() { public void handleNaturalIdPostSaveNotifications(Serializable id) {
if (isEarlyInsert()) {
// with early insert, we still need to add a local (transactional) natural id cross-reference
getSession().getPersistenceContext().getNaturalIdHelper().manageLocalNaturalIdCrossReference(
getPersister(),
id,
state,
null,
CachedNaturalIdValueSource.INSERT
);
}
// after save, we need to manage the shared cache entries // after save, we need to manage the shared cache entries
getSession().getPersistenceContext().getNaturalIdHelper().manageSharedNaturalIdCrossReference( getSession().getPersistenceContext().getNaturalIdHelper().manageSharedNaturalIdCrossReference(
getPersister(), getPersister(),

2
hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java
View File

@ -123,7 +123,7 @@ public final class EntityInsertAction extends AbstractEntityInsertAction {
} }
} }
handleNaturalIdPostSaveNotifications(); handleNaturalIdPostSaveNotifications(id);
postInsert(); postInsert();

2
hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java
View File

@ -298,6 +298,8 @@ public abstract class AbstractSaveEventListener extends AbstractReassociateEvent
insert.getClass().getName() ); insert.getClass().getName() );
} }
id = ( ( EntityIdentityInsertAction ) insert ).getGeneratedId(); id = ( ( EntityIdentityInsertAction ) insert ).getGeneratedId();
insert.handleNaturalIdPostSaveNotifications(id);
} }
markInterceptorDirty( entity, persister, source ); markInterceptorDirty( entity, persister, source );