garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

always join for statuses

Browse Source
This commit is contained in:
Athou
2013-07-23 16:45:13 +02:00
parent 08693e16f0
commit f4eb9e2a09
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
View File

@@ -161,12 +161,12 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
contentJoin.add(or); contentJoin.add(or);
} }
} }
Criteria statusJoin = criteria.createCriteria(
FeedEntry_.statuses.getName(), ALIAS_STATUS,
JoinType.LEFT_OUTER_JOIN,
Restrictions.eq(FeedEntryStatus_.subscription.getName(), sub));
if (unreadOnly) { 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(); Disjunction or = Restrictions.disjunction();
or.add(Restrictions.isNull(FeedEntryStatus_.read.getName())); or.add(Restrictions.isNull(FeedEntryStatus_.read.getName()));
@@ -178,7 +178,6 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
criteria.add(Restrictions.ge(FeedEntry_.inserted.getName(), criteria.add(Restrictions.ge(FeedEntry_.inserted.getName(),
unreadThreshold)); unreadThreshold));
} }
} }
if (last != null) { if (last != null) {