HHH-19085 NPE when using null value in CriteriaUpdate

dreab8 · dreab8 · commit e0e405836fff · 2025-10-01T13:22:19.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
@@ -2182,6 +2182,9 @@ private static <X, T extends X> BindableType<? extends X> resolveInferredParamet
 	}
 
 	private <T> ValueBindJpaCriteriaParameter<T> valueParameter(T value, SqmExpression<? extends T> typeInferenceSource) {
+		if ( value == null ) {
+			return new ValueBindJpaCriteriaParameter<>( null, value, this );
+		}
 		final var bindableType = resolveInferredParameterType( value, typeInferenceSource, getTypeConfiguration() );
 		if ( bindableType == null || isInstance( bindableType, value) ) {
 			@SuppressWarnings("unchecked") // safe, we just checked

Original file line number	Diff line number	Diff line change
`@@ -2182,6 +2182,9 @@ private static <X, T extends X> BindableType<? extends X> resolveInferredParamet`
`2182`	`2182`	`}`
`2183`	`2183`
`2184`	`2184`	`private <T> ValueBindJpaCriteriaParameter<T> valueParameter(T value, SqmExpression<? extends T> typeInferenceSource) {`
	`2185`	`+ if ( value == null ) {`
	`2186`	`+ return new ValueBindJpaCriteriaParameter<>( null, value, this );`
	`2187`	`+ }`
`2185`	`2188`	`final var bindableType = resolveInferredParameterType( value, typeInferenceSource, getTypeConfiguration() );`
`2186`	`2189`	`if ( bindableType == null \|\| isInstance( bindableType, value) ) {`
`2187`	`2190`	`@SuppressWarnings("unchecked") // safe, we just checked`