HHH-18484 Account for null generated values for no-op updates

mbellade · mbellade · commit 3001b7f01d24 · 2024-09-16T11:24:54.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/GeneratedValuesProcessor.java
@@ -153,8 +153,8 @@ public void processGeneratedValues(
 				assert results.size() == 1;
 				setEntityAttributes( entity, state, results.get( 0 ) );
 			}
-			else {
-				castNonNull( generatedValues );
+			else if ( generatedValues != null ) {
+				// can be null when an update action resulted in a no-op (e.g. only changes to unowned association)
 				final List<Object> results = generatedValues.getGeneratedValues( generatedValuesToSelect );
 				setEntityAttributes( entity, state, results.toArray( new Object[0] ) );
 			}

Original file line number	Diff line number	Diff line change
`@@ -153,8 +153,8 @@ public void processGeneratedValues(`
`153`	`153`	`assert results.size() == 1;`
`154`	`154`	`setEntityAttributes( entity, state, results.get( 0 ) );`
`155`	`155`	`}`
`156`		`- else {`
`157`		`- castNonNull( generatedValues );`
	`156`	`+ else if ( generatedValues != null ) {`
	`157`	`+ // can be null when an update action resulted in a no-op (e.g. only changes to unowned association)`
`158`	`158`	`final List<Object> results = generatedValues.getGeneratedValues( generatedValuesToSelect );`
`159`	`159`	`setEntityAttributes( entity, state, results.toArray( new Object[0] ) );`
`160`	`160`	`}`