From 51ac16a9e1af32b2bb2f635ff9e7f72ee91febce Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Mon, 12 Aug 2013 10:03:34 +0200
Subject: [PATCH] small refactoring

---
 .../backend/dao/FeedEntryStatusDAO.java       | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
index 58baf984..12aa10e8 100644
--- a/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
+++ b/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
@@ -222,24 +222,26 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 			}
 		}
 
-		List<FeedEntryStatus> statusPlaceholders = set.asList();
-		int size = statusPlaceholders.size();
+		List<FeedEntryStatus> placeholders = set.asList();
+		int size = placeholders.size();
 		if (size < offset) {
 			return Lists.newArrayList();
 		}
+		placeholders = placeholders.subList(Math.max(offset, 0), size);
 
-		statusPlaceholders = statusPlaceholders.subList(Math.max(offset, 0), size);
-
-		if (!onlyIds) {
-			List<FeedEntryStatus> statuses = Lists.newArrayList();
-			for (FeedEntryStatus status : statusPlaceholders) {
-				Long statusId = status.getId();
-				FeedEntry entry = em.find(FeedEntry.class, status.getEntry().getId());
-				statuses.add(handleStatus(statusId == null ? null : findById(statusId), status.getSubscription(), entry));
+		List<FeedEntryStatus> statuses = null;
+		if (onlyIds) {
+			statuses = placeholders;
+		} else {
+			statuses = Lists.newArrayList();
+			for (FeedEntryStatus placeholder : placeholders) {
+				Long statusId = placeholder.getId();
+				FeedEntry entry = em.find(FeedEntry.class, placeholder.getEntry().getId());
+				statuses.add(handleStatus(statusId == null ? null : findById(statusId), placeholder.getSubscription(), entry));
 			}
-			statusPlaceholders = lazyLoadContent(includeContent, statuses);
+			statuses = lazyLoadContent(includeContent, statuses);
 		}
-		return statusPlaceholders;
+		return statuses;
 	}
 
 	@SuppressWarnings("unchecked")