diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java index b133f40a..1d9a0b0c 100644 --- a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java +++ b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java @@ -161,12 +161,12 @@ public class FeedEntryStatusDAO extends GenericDAO { contentJoin.add(or); } } + Criteria statusJoin = criteria.createCriteria( + FeedEntry_.statuses.getName(), ALIAS_STATUS, + JoinType.LEFT_OUTER_JOIN, + Restrictions.eq(FeedEntryStatus_.subscription.getName(), sub)); if (unreadOnly) { - Criteria statusJoin = criteria.createCriteria(FeedEntry_.statuses - .getName(), ALIAS_STATUS, JoinType.LEFT_OUTER_JOIN, - Restrictions.eq(FeedEntryStatus_.subscription.getName(), - sub)); Disjunction or = Restrictions.disjunction(); or.add(Restrictions.isNull(FeedEntryStatus_.read.getName())); @@ -178,7 +178,6 @@ public class FeedEntryStatusDAO extends GenericDAO { criteria.add(Restrictions.ge(FeedEntry_.inserted.getName(), unreadThreshold)); } - } if (last != null) {