From 1445486d4bb0edbb2260d820899aad6a06f90d54 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Tue, 4 Jun 2013 13:50:23 +0200
Subject: [PATCH] tweaking for feeds returning 304

---
 .../backend/feeds/FeedRefreshWorker.java      | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
index 8188476f..3699bc78 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshWorker.java
@@ -85,7 +85,6 @@ public class FeedRefreshWorker {
 
 	private void update(Feed feed) {
 
-
 		try {
 			FetchedFeed fetchedFeed = fetcher.fetch(feed.getUrl(), false,
 					feed.getLastModifiedHeader(), feed.getEtagHeader());
@@ -114,13 +113,24 @@ public class FeedRefreshWorker {
 
 		} catch (NotModifiedException e) {
 			log.debug("Feed not modified (304) : " + feed.getUrl());
-			List<FeedEntry> feedEntries = feedEntryDAO.findByFeed(feed, 0, 10);
-			Date publishedDate = null;
-			if (feedEntries.size() > 0) {
-				publishedDate = feedEntries.get(0).getInserted();
+
+			feed.setErrorCount(0);
+			feed.setMessage(null);
+
+			Date disabledUntil = null;
+			if (applicationSettingsService.get().isHeavyLoad()) {
+				List<FeedEntry> feedEntries = feedEntryDAO.findByFeed(feed, 0,
+						10);
+
+				Date publishedDate = null;
+				if (feedEntries.size() > 0) {
+					publishedDate = feedEntries.get(0).getInserted();
+				}
+				disabledUntil = FeedUtils.buildDisabledUntil(publishedDate,
+						feedEntries);
 			}
-			feed.setDisabledUntil(FeedUtils.buildDisabledUntil(publishedDate,
-					feedEntries));
+			feed.setDisabledUntil(disabledUntil);
+
 			taskGiver.giveBack(feed);
 		} catch (Exception e) {
 			String message = "Unable to refresh feed " + feed.getUrl() + " : "