From 7b17735cc0d57f94423acfa88a1f3a4f8bd5cd20 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Mon, 26 Jan 2015 14:54:32 +0100 Subject: [PATCH] [#3982] Empty, OR-connected CombinedConditions should return FALSE, not TRUE --- jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java b/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java index bf4e8245c9..dc3a5978a3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java @@ -45,6 +45,7 @@ import static org.jooq.Clause.CONDITION; import static org.jooq.Clause.CONDITION_AND; import static org.jooq.Clause.CONDITION_OR; import static org.jooq.Operator.AND; +import static org.jooq.impl.DSL.falseCondition; import static org.jooq.impl.DSL.trueCondition; import java.util.ArrayList; @@ -112,7 +113,10 @@ class CombinedCondition extends AbstractCondition { @Override public final void accept(Context ctx) { if (conditions.isEmpty()) { - ctx.visit(trueCondition()); + if (operator == AND) + ctx.visit(trueCondition()); + else + ctx.visit(falseCondition()); } else if (conditions.size() == 1) { ctx.visit(conditions.get(0));