diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/ColQueryMixin.java b/querydsl-collections/src/main/java/com/mysema/query/collections/ColQueryMixin.java index 4bc761bef..03e80ccef 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/ColQueryMixin.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/ColQueryMixin.java @@ -37,7 +37,9 @@ public class ColQueryMixin extends QueryMixin { @Override protected Predicate[] normalize(Predicate[] conditions, boolean where) { for (int i = 0; i < conditions.length; i++){ - conditions[i] = normalize(conditions[i], where); + if (conditions[i] != null) { + conditions[i] = normalize(conditions[i], where); + } } return conditions; } diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLQueryMixin.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLQueryMixin.java index b9e040c70..37639b156 100644 --- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLQueryMixin.java +++ b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLQueryMixin.java @@ -43,7 +43,9 @@ public class JDOQLQueryMixin extends QueryMixin { @Override protected Predicate[] normalize(Predicate[] conditions, boolean where) { for (int i = 0; i < conditions.length; i++){ - conditions[i] = normalize(conditions[i], where); + if (conditions[i] != null) { + conditions[i] = normalize(conditions[i], where); + } } return conditions; } diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java index 99d56014d..d58972b0c 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java @@ -71,7 +71,9 @@ public class JPQLQueryMixin extends QueryMixin { @Override protected Predicate[] normalize(Predicate[] conditions, boolean where) { for (int i = 0; i < conditions.length; i++){ - conditions[i] = normalize(conditions[i], where); + if (conditions[i] != null) { + conditions[i] = normalize(conditions[i], where); + } } return conditions; }