From 6217f236fab8e27e5b2fcd3cdb151de6888c3f83 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sun, 14 Apr 2013 18:12:35 +0200
Subject: [PATCH] avoid an extra database roundtrip

---
 .../java/com/commafeed/backend/feeds/FeedRefreshWorker.java    | 3 +--
 .../java/com/commafeed/backend/services/FeedUpdateService.java | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
index 25f8ac06..a91e4611 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
@@ -106,8 +106,7 @@ public class FeedRefreshWorker {
 		transaction.begin();
 
 		if (fetchedFeed != null) {
-			feedUpdateService.updateEntries(feed.getUrl(),
-					fetchedFeed.getEntries());
+			feedUpdateService.updateEntries(feed, fetchedFeed.getEntries());
 			if (feed.getLink() == null) {
 				feed.setLink(fetchedFeed.getLink());
 			}
diff --git a/src/main/java/com/commafeed/backend/services/FeedUpdateService.java b/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
index 5a24f983..04b46d79 100644
--- a/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
+++ b/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
@@ -36,8 +36,7 @@ public class FeedUpdateService {
 	@Inject
 	FeedEntryStatusDAO feedEntryStatusDAO;
 
-	public void updateEntries(String url, Collection<FeedEntry> entries) {
-		Feed feed = feedDAO.findByUrl(url);
+	public void updateEntries(Feed feed, Collection<FeedEntry> entries) {
 		List<String> guids = Lists.newArrayList();
 		for (FeedEntry entry : entries) {
 			guids.add(entry.getGuid());