github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#7584] Regression in DSL.or(Collection) when passing empty collection

Browse Source
This commit is contained in:
lukaseder 2018-06-19 12:58:52 +02:00
parent f7e6b6987f
commit 0339de9bac
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java
View File

@ -43,7 +43,6 @@ 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.noCondition;
import static org.jooq.impl.DSL.trueCondition;
import static org.jooq.impl.Keywords.K_AND;
import static org.jooq.impl.Keywords.K_OR;
@ -80,9 +79,6 @@ final class CombinedCondition extends AbstractCondition {
}
static Condition of(Operator operator, Collection<? extends Condition> conditions) {
if (conditions.isEmpty())
return noCondition();
CombinedCondition result = null;
Condition first = null;
@ -101,8 +97,10 @@ final class CombinedCondition extends AbstractCondition {
return result;
else if (first != null)
return first;
else if (operator == AND)
return trueCondition();
else
return noCondition();
return falseCondition();
}
private CombinedCondition(Operator operator, int size) {