From 491af8a6df64ea262f5870ae21b50407775b7c73 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Tue, 18 Jun 2013 13:48:07 +0200
Subject: [PATCH] don't sort when just marking

---
 .../backend/dao/FeedEntryStatusDAO.java       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
index 21e2972f..bfe305cb 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
@@ -295,11 +295,13 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 
 	private void orderBy(CriteriaQuery<FeedEntryStatus> query,
 			Join<FeedEntryStatus, FeedEntry> entryJoin, ReadingOrder order) {
-		Path<Date> orderPath = entryJoin.get(FeedEntry_.updated);
-		if (order == ReadingOrder.asc) {
-			query.orderBy(builder.asc(orderPath));
-		} else {
-			query.orderBy(builder.desc(orderPath));
+		if (order != null) {
+			Path<Date> orderPath = entryJoin.get(FeedEntry_.updated);
+			if (order == ReadingOrder.asc) {
+				query.orderBy(builder.asc(orderPath));
+			} else {
+				query.orderBy(builder.desc(orderPath));
+			}
 		}
 	}
 
@@ -337,26 +339,24 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 	public void markSubscriptionEntries(FeedSubscription subscription,
 			Date olderThan) {
 		List<FeedEntryStatus> statuses = findBySubscription(subscription, true,
-				ReadingOrder.desc, false);
+				null, false);
 		saveOrUpdate(markList(statuses, olderThan));
 	}
 
 	public void markCategoryEntries(User user, List<FeedCategory> categories,
 			Date olderThan) {
 		List<FeedEntryStatus> statuses = findByCategories(categories, user,
-				true, ReadingOrder.desc, false);
+				true, null, false);
 		saveOrUpdate(markList(statuses, olderThan));
 	}
 
 	public void markStarredEntries(User user, Date olderThan) {
-		List<FeedEntryStatus> statuses = findStarred(user, ReadingOrder.desc,
-				false);
+		List<FeedEntryStatus> statuses = findStarred(user, null, false);
 		saveOrUpdate(markList(statuses, olderThan));
 	}
 
 	public void markAllEntries(User user, Date olderThan) {
-		List<FeedEntryStatus> statuses = findAll(user, true, ReadingOrder.desc,
-				false);
+		List<FeedEntryStatus> statuses = findAll(user, true, null, false);
 		saveOrUpdate(markList(statuses, olderThan));
 	}