From 18a7bd1fd1a83b3b8d1b245e32f78c0b4443b7a7 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Mon, 8 Jun 2015 15:37:58 +0200
Subject: [PATCH] check both urls for favicon

---
 .../commafeed/backend/favicon/DefaultFaviconFetcher.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java b/src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java
index 9645f793..0dd242d7 100644
--- a/src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java
+++ b/src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java
@@ -29,8 +29,14 @@ public class DefaultFaviconFetcher extends AbstractFaviconFetcher {
 
 	@Override
 	public byte[] fetch(Feed feed) {
-		String url = feed.getLink() != null ? feed.getLink() : feed.getUrl();
+		byte[] icon = fetch(feed.getLink());
+		if (icon == null) {
+			icon = fetch(feed.getUrl());
+		}
+		return icon;
+	}
 
+	private byte[] fetch(String url) {
 		if (url == null) {
 			log.debug("url is null");
 			return null;