diff --git a/hibernate-core/src/main/java/org/hibernate/Session.java b/hibernate-core/src/main/java/org/hibernate/Session.java index 6bb79f3e6348..9143e554c865 100644 --- a/hibernate-core/src/main/java/org/hibernate/Session.java +++ b/hibernate-core/src/main/java/org/hibernate/Session.java @@ -46,11 +46,8 @@ *

* Each persistent instance has a persistent identity determined by its type * and identifier value. There may be at most one persistent instance with a given - * persistent identity associated with a given session. Normally, a persistent identity - * is assigned when an {@linkplain #persist(Object) instance is made persistent}, but - * when the entity identifier is {@linkplain org.hibernate.generator.OnExecutionGenerator - * generated by the database}, assignment of the persistent identity is delayed until - * the state of the entity is actually inserted in the database. + * persistent identity associated with a given session. A persistent identity is + * assigned when an {@linkplain #persist(Object) instance is made persistent}. *

* An instance of an entity class may be associated with at most one open session. * Distinct sessions represent state with the same persistent identity using distinct diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java index dcc7437a71a0..dd764c121d0a 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractSaveEventListener.java @@ -313,8 +313,8 @@ protected Object performSaveOrReplicate( private static Object handleGeneratedId(boolean useIdentityColumn, Object id, AbstractEntityInsertAction insert) { if ( useIdentityColumn && insert.isEarlyInsert() ) { - if ( insert instanceof EntityIdentityInsertAction ) { - final Object generatedId = ((EntityIdentityInsertAction) insert).getGeneratedId(); + if ( insert instanceof EntityIdentityInsertAction entityIdentityInsertAction ) { + final Object generatedId = entityIdentityInsertAction.getGeneratedId(); insert.handleNaturalIdPostSaveNotifications( generatedId ); return generatedId; }