From c4185034e44f6e6fb3c11e21326b15d5ec4c2420 Mon Sep 17 00:00:00 2001 From: Athou Date: Mon, 12 Jan 2015 09:57:30 +0100 Subject: [PATCH] urlAfterRedirect was always null (#699) --- src/main/java/com/commafeed/backend/feed/FeedFetcher.java | 4 ++-- src/main/java/com/commafeed/backend/feed/FeedParser.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/commafeed/backend/feed/FeedFetcher.java b/src/main/java/com/commafeed/backend/feed/FeedFetcher.java index 0929b72f..8ba02971 100644 --- a/src/main/java/com/commafeed/backend/feed/FeedFetcher.java +++ b/src/main/java/com/commafeed/backend/feed/FeedFetcher.java @@ -41,7 +41,7 @@ public class FeedFetcher { byte[] content = result.getContent(); try { - fetchedFeed = parser.parse(feedUrl, content); + fetchedFeed = parser.parse(result.getUrlAfterRedirect(), content); } catch (FeedException e) { if (extractFeedUrlFromHtml) { String extractedUrl = extractFeedUrl(StringUtils.newStringUtf8(result.getContent()), feedUrl); @@ -50,7 +50,7 @@ public class FeedFetcher { result = getter.getBinary(extractedUrl, lastModified, eTag, timeout); content = result.getContent(); - fetchedFeed = parser.parse(feedUrl, content); + fetchedFeed = parser.parse(result.getUrlAfterRedirect(), content); } else { throw e; } diff --git a/src/main/java/com/commafeed/backend/feed/FeedParser.java b/src/main/java/com/commafeed/backend/feed/FeedParser.java index d74ab8aa..ac49b254 100644 --- a/src/main/java/com/commafeed/backend/feed/FeedParser.java +++ b/src/main/java/com/commafeed/backend/feed/FeedParser.java @@ -77,7 +77,7 @@ public class FeedParser { } entry.setGuid(FeedUtils.truncate(guid, 2048)); entry.setUpdated(validateDate(getEntryUpdateDate(item), true)); - entry.setUrl(FeedUtils.truncate(FeedUtils.toAbsoluteUrl(item.getLink(), feed.getLink(), feed.getUrlAfterRedirect()), 2048)); + entry.setUrl(FeedUtils.truncate(FeedUtils.toAbsoluteUrl(item.getLink(), feed.getLink(), feedUrl), 2048)); // if link is empty but guid is used as url if (StringUtils.isBlank(entry.getUrl()) && StringUtils.startsWith(entry.getGuid(), "http")) {