HHH-19085 NPE when using null value in CriteriaUpdate

Author: dreab8

hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java

@@ -9,6 +9,7 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.query.spi.QueryParameterImplementor;
 import org.hibernate.query.sqm.tree.expression.JpaCriteriaParameter;
+import org.hibernate.query.sqm.tree.expression.ValueBindJpaCriteriaParameter;
 import org.hibernate.type.BindableType;
 import org.hibernate.query.KeyedPage;
 import org.hibernate.query.KeyedResultList;
@@ -149,15 +150,12 @@ protected static void bindValueBindCriteriaParameters(
 			if ( sqmParameter instanceof SqmJpaCriteriaParameterWrapper<?> wrapper ) {
 				@SuppressWarnings("unchecked")
 				final var criteriaParameter = (JpaCriteriaParameter<Object>) wrapper.getJpaCriteriaParameter();
-				final var value = criteriaParameter.getValue();
-				// We don't set a null value, unless the type is also null which
-				// is the case when using HibernateCriteriaBuilder.value
-				if ( value != null || criteriaParameter.getNodeType() == null ) {
+				if ( criteriaParameter instanceof ValueBindJpaCriteriaParameter<?> ) {
 					// Use the anticipated type for binding the value if possible
 					//noinspection unchecked
 					final var parameter = (QueryParameterImplementor<Object>) entry.getKey();
 					bindings.getBinding( parameter )
-							.setBindValue( value, criteriaParameter.getAnticipatedType() );
+							.setBindValue( criteriaParameter.getValue(), criteriaParameter.getAnticipatedType() );
 				}
 			}
 		}

hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java

@@ -2146,7 +2146,10 @@ else if ( value instanceof SqmExpression<?> ) {
 	}
 
 	private <T> boolean isInstance(BindableType<? extends T> bindableType, T value) {
-		if ( bindableType instanceof SqmExpressible<?> expressible ) {
+		if ( value == null ) {
+			return true;
+		}
+		else if ( bindableType instanceof SqmExpressible<?> expressible ) {
 			return expressible.getExpressibleJavaType().isInstance( value );
 		}
 		else {