From 191680a01bc4b10ed4c8db1314fd53321038422a Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Thu, 19 Feb 2015 13:00:47 +0100
Subject: [PATCH] correctly set timeout on query

---
 .../java/com/commafeed/backend/dao/FeedEntryStatusDAO.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
index b652bda9..524012dd 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
@@ -104,7 +104,11 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 			query.orderBy(status.entryUpdated.desc(), status.id.desc());
 		}
 
-		query.offset(offset).limit(limit).setTimeout(config.getApplicationSettings().getQueryTimeout());
+		query.offset(offset).limit(limit);
+		int timeout = config.getApplicationSettings().getQueryTimeout();
+		if (timeout > 0) {
+			query.setTimeout(timeout / 1000);
+		}
 
 		List<FeedEntryStatus> statuses = query.list(status);
 		for (FeedEntryStatus status : statuses) {