From 71bb33d710e1ce9b5eb79dd9731f2e6debdae305 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Wed, 31 Jul 2013 12:07:29 +0200
Subject: [PATCH] small cleanup

---
 .../com/commafeed/backend/feeds/FeedParser.java    | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/feeds/FeedParser.java b/src/main/java/com/commafeed/backend/feeds/FeedParser.java
index c6cff004..77b759bb 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedParser.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedParser.java
@@ -105,9 +105,9 @@ public class FeedParser {
 				List<Long> sortedTimestamps = FeedUtils.getSortedTimestamps(entries);
 				Long timestamp = sortedTimestamps.get(0);
 				lastEntryDate = new Date(timestamp);
-				publishedDate = getFeedPublishedDate(publishedDate, entries);
+				publishedDate = (publishedDate == null || publishedDate.before(lastEntryDate)) ? lastEntryDate : publishedDate;
 			}
-			feed.setLastPublishedDate(validateDate(publishedDate, true));
+			feed.setLastPublishedDate(publishedDate);
 			feed.setAverageEntryInterval(FeedUtils.averageTimeBetweenEntries(entries));
 			feed.setLastEntryDate(lastEntryDate);
 
@@ -142,16 +142,6 @@ public class FeedParser {
 		}
 	}
 
-	private Date getFeedPublishedDate(Date publishedDate, List<FeedEntry> entries) {
-
-		for (FeedEntry entry : entries) {
-			if (publishedDate == null || entry.getUpdated().getTime() > publishedDate.getTime()) {
-				publishedDate = entry.getUpdated();
-			}
-		}
-		return publishedDate;
-	}
-
 	private Date getEntryUpdateDate(SyndEntry item) {
 		Date date = item.getUpdatedDate();
 		if (date == null) {