From d1973922cd786f87cb81d3b0e1e38046a42e2aea Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Thu, 19 Feb 2015 08:30:44 +0100
Subject: [PATCH] check for empty lists too

---
 .../java/com/commafeed/backend/dao/FeedEntryStatusDAO.java     | 3 ++-
 1 file changed, 2 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 1843dc2c..b652bda9 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
@@ -8,6 +8,7 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.builder.CompareToBuilder;
 import org.hibernate.SessionFactory;
 
@@ -118,7 +119,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 
 		HibernateQuery query = newQuery().from(entry).where(entry.feed.eq(sub.getFeed()));
 
-		if (keywords != null) {
+		if (CollectionUtils.isNotEmpty(keywords)) {
 			query.join(entry.content, content);
 
 			for (FeedEntryKeyword keyword : keywords) {