From e1e8147e977bbf7f8291993e41eefdd6c304e7cc Mon Sep 17 00:00:00 2001
From: Matija Obreza <matija.obreza@croptrust.org>
Date: Wed, 6 Aug 2014 12:20:49 +0200
Subject: [PATCH] Fixed the extra OR in generated filter query

---
 .../org/genesys2/server/service/impl/DirectMysqlQuery.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/genesys2/server/service/impl/DirectMysqlQuery.java b/src/main/java/org/genesys2/server/service/impl/DirectMysqlQuery.java
index 3e90f60b8..ac7c008e1 100644
--- a/src/main/java/org/genesys2/server/service/impl/DirectMysqlQuery.java
+++ b/src/main/java/org/genesys2/server/service/impl/DirectMysqlQuery.java
@@ -238,10 +238,11 @@ public class DirectMysqlQuery {
 				sb.append(" OR ");
 			}
 
-			handledCount += handleNullValues(sb, dbName, fieldQuery.elements(), params);
+			int handledCountNull = handleNullValues(sb, dbName, fieldQuery.elements(), params);
+			handledCount += handledCountNull;
 
 			// do we have more?
-			if (handledCount > 0 && fieldQuery.size() > handledCount) {
+			if (handledCountNull > 0 && handledCount > 0 && fieldQuery.size() > handledCount) {
 				sb.append(" OR ");
 			}
 
-- 
GitLab