This commit is contained in:
Athou
2013-04-22 11:58:06 +02:00
parent 839beb5d14
commit 1cd153a4ba

View File

@@ -37,12 +37,12 @@ public class FeedDAO extends GenericDAO<Feed> {
Predicate disabledDateIsNull = builder.isNull(root Predicate disabledDateIsNull = builder.isNull(root
.get(Feed_.disabledUntil)); .get(Feed_.disabledUntil));
Predicate DisabledDateIsInPast = builder.lessThan( Predicate disabledDateIsInPast = builder.lessThan(
root.get(Feed_.disabledUntil), now); root.get(Feed_.disabledUntil), now);
query.where(hasSubscriptions, query.where(hasSubscriptions,
builder.or(neverUpdated, updatedMoreThanOneMinuteAgo), builder.or(neverUpdated, updatedMoreThanOneMinuteAgo),
builder.or(disabledDateIsNull, DisabledDateIsInPast)); builder.or(disabledDateIsNull, disabledDateIsInPast));
query.orderBy(builder.asc(root.get(Feed_.lastUpdated))); query.orderBy(builder.asc(root.get(Feed_.lastUpdated)));
TypedQuery<Feed> q = em.createQuery(query); TypedQuery<Feed> q = em.createQuery(query);