HHH-19085 NPE when using null value in CriteriaUpdate

Author: dreab8

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

@@ -8,6 +8,7 @@
 import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.graph.spi.AppliedGraph;
+import org.hibernate.query.sqm.tree.expression.ValueBindJpaCriteriaParameter;
 import org.hibernate.type.BindableType;
 import org.hibernate.query.IllegalSelectQueryException;
 import org.hibernate.query.KeyedPage;
@@ -158,14 +159,11 @@ else if ( bindType != null ) {
 
 	protected <T> void bindCriteriaParameter(SqmJpaCriteriaParameterWrapper<T> sqmParameter) {
 		final JpaCriteriaParameter<T> criteriaParameter = sqmParameter.getJpaCriteriaParameter();
-		final T 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.getNodeType() instanceof ValueBindJpaCriteriaParameter<?> ) {
 			// Use the anticipated type for binding the value if possible
 			getQueryParameterBindings()
 					.getBinding( criteriaParameter )
-					.setBindValue( value, criteriaParameter.getAnticipatedType() );
+					.setBindValue( criteriaParameter.getValue(), criteriaParameter.getAnticipatedType() );
 		}
 	}
 

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

@@ -2147,7 +2147,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 {