- if (where.isUnion()) {
- currQomConstraint = factory.or(currQomConstraint, toQomConstraint(c));
- } else {
- currQomConstraint = factory.and(currQomConstraint, toQomConstraint(c));
- }
+ javax.jcr.query.qom.Constraint subQomConstraint = toQomConstraint(c);
+ if (subQomConstraint != null) // isContentClass leads to null QOM constraint
+ if (where.isUnion()) {
+ currQomConstraint = factory.or(currQomConstraint, subQomConstraint);
+ } else {
+ currQomConstraint = factory.and(currQomConstraint, subQomConstraint);
+ }