HHH-16825 Cascading an entity with a composite key causes NullPointer…

…Exception in AbstractClassJavaType.extractHashCode
hibernate · Jul 24, 2023 · bf9a828 · bf9a828
1 parent b66ba5f
commit bf9a828
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
@@ -221,9 +221,7 @@ protected void entityIsTransient(MergeEvent event, MergeContext copyCache) {
 		final EventSource session = event.getSession();
 		final String entityName = event.getEntityName();
 		final EntityPersister persister = session.getEntityPersister( entityName, entity );
-		final Object id = persister.hasIdentifierProperty()
-				? persister.getIdentifier( entity, session )
-				: null;
+		final Object id = persister.getIdentifier( entity, session );
 		final Object copy = copyEntity( copyCache, entity, session, persister, id );
 
 		// cascade first, so that all unsaved objects get their
@@ -233,10 +231,13 @@ protected void entityIsTransient(MergeEvent event, MergeContext copyCache) {
 		copyValues( persister, entity, copy, session, copyCache, ForeignKeyDirection.FROM_PARENT );
 
 		saveTransientEntity( copy, entityName, event.getRequestedId(), session, copyCache );
+		persister.setIdentifier( entity, persister.getIdentifier( copy, session ), session );
 
 		// cascade first, so that all unsaved objects get their
 		// copy created before we actually copy
 		super.cascadeAfterSave( session, persister, entity, copyCache );
+
+
 		copyValues( persister, entity, copy, session, copyCache, ForeignKeyDirection.TO_PARENT );
 
 		// saveTransientEntity has been called using a copy that contains empty collections