From e43ec5c2f4738f4696874af55118da43d04ce28d Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Mon, 27 May 2013 22:54:40 +0200
Subject: [PATCH] actually use both guid and url as this is what we use later
 on to identify entries

---
 .../java/com/commafeed/backend/feeds/FeedRefreshUpdater.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java b/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
index 44b25e5e..c6b88a8a 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedRefreshUpdater.java
@@ -135,7 +135,7 @@ public class FeedRefreshUpdater {
 
 	private boolean updateEntry(final Feed feed, final FeedEntry entry,
 			final List<FeedSubscription> subscriptions) {
-		String key = StringUtils.trimToEmpty(entry.getUrl());
+		String key = StringUtils.trimToEmpty(entry.getGuid() + entry.getUrl());
 		Lock lock = locks.get(key);
 		boolean locked = false;
 		try {