Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-15037 Criteria Update/Delete with vararg parameters throws NullPointerException

This commit is contained in:
William Burns 2022-01-18 11:43:28 -05:00 committed by Christian Beikov
parent cfb98abf7a
commit 1ede36212b
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hibernate-core/src/main/java/org/hibernate/query/sqm/tree/AbstractSqmRestrictedDmlStatement.java
View File

@ -62,11 +62,7 @@ public abstract class AbstractSqmRestrictedDmlStatement<T> extends AbstractSqmDm
return;
}
if ( whereClause == null ) {
whereClause = new SqmWhereClause( nodeBuilder() );
}
whereClause.applyPredicate( predicate );
initAndGetWhereClause().applyPredicate( predicate );
}
public void setWhereClause(SqmWhereClause whereClause) {
@ -79,13 +75,21 @@ public abstract class AbstractSqmRestrictedDmlStatement<T> extends AbstractSqmDm
}
protected void setWhere(Expression<Boolean> restriction) {
applyPredicate( null );
applyPredicate( (SqmPredicate) restriction );
// Replaces the current predicate if one is present
initAndGetWhereClause().setPredicate( (SqmPredicate) restriction );
}
protected SqmWhereClause initAndGetWhereClause() {
if ( whereClause == null ) {
whereClause = new SqmWhereClause( nodeBuilder() );
}
return whereClause;
}
protected void setWhere(Predicate... restrictions) {
applyPredicate( null );
final SqmWhereClause whereClause = getWhereClause();
final SqmWhereClause whereClause = initAndGetWhereClause();
// Clear the current predicate if one is present
whereClause.setPredicate(null);
for ( Predicate restriction : restrictions ) {
whereClause.applyPredicate( (SqmPredicate) restriction );
}

18
hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/ManipulationCriteriaTest.java
View File

@ -65,7 +65,7 @@ public class ManipulationCriteriaTest extends AbstractMetamodelSpecificTest {
{
CriteriaUpdate<Customer> updateCriteria = builder.createCriteriaUpdate( Customer.class );
Root<Customer> root = updateCriteria.from( Customer.class );
updateCriteria.set( Customer_.name, "Acme" );
updateCriteria.set( Customer_.age, 23 );
updateCriteria.where(
builder.equal(
root.get( Customer_.name ),
@ -75,6 +75,22 @@ public class ManipulationCriteriaTest extends AbstractMetamodelSpecificTest {
em.createQuery( updateCriteria ).executeUpdate();
}
{
CriteriaDelete<Customer> deleteCriteria = builder.createCriteriaDelete( Customer.class );
Root<Customer> root = deleteCriteria.from( Customer.class );
deleteCriteria.where(
builder.equal(
root.get( Customer_.name ),
"Acme"
),
builder.equal(
root.get(Customer_.age),
23
)
);
em.createQuery( deleteCriteria ).executeUpdate();
}
em.getTransaction().commit();
em.close();
}