From cda239ef4a080693535d68b0dfd60520806059fb Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Thu, 9 May 2013 06:13:20 +0200
Subject: [PATCH] some feeds don't use a globally unique id as a guid (sigh)

---
 .../com/commafeed/backend/services/FeedUpdateService.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/services/FeedUpdateService.java b/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
index 2d04b539..4f941aad 100644
--- a/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
+++ b/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
@@ -93,7 +93,9 @@ public class FeedUpdateService {
 	private FeedEntry findEntry(List<FeedEntry> existingEntries, FeedEntry entry) {
 		FeedEntry foundEntry = null;
 		for (FeedEntry existingEntry : existingEntries) {
-			if (StringUtils.equals(entry.getGuid(), existingEntry.getGuid())) {
+			if (StringUtils.equals(entry.getGuid(), existingEntry.getGuid())
+					&& StringUtils.equals(entry.getUrl(),
+							existingEntry.getUrl())) {
 				foundEntry = existingEntry;
 				break;
 			}
@@ -108,7 +110,6 @@ public class FeedUpdateService {
 		}
 		List<FeedEntry> existingEntries = guids.isEmpty() ? new ArrayList<FeedEntry>()
 				: feedEntryDAO.findByGuids(guids);
-
 		return existingEntries;
 	}
 }