From 99d80df76c97f82b668fca5264284144010ebcfb Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Thu, 23 Dec 2021 16:15:26 +0100
Subject: [PATCH] prevent NPE if icon.getMediaType() is ""

---
 src/main/java/com/commafeed/frontend/resource/FeedREST.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/commafeed/frontend/resource/FeedREST.java b/src/main/java/com/commafeed/frontend/resource/FeedREST.java
index 3f643a67..1fc0aae8 100644
--- a/src/main/java/com/commafeed/frontend/resource/FeedREST.java
+++ b/src/main/java/com/commafeed/frontend/resource/FeedREST.java
@@ -10,7 +10,6 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import javax.inject.Inject;
@@ -361,7 +360,7 @@ public class FeedREST {
 		Feed feed = subscription.getFeed();
 		Favicon icon = feedService.fetchFavicon(feed);
 
-		ResponseBuilder builder = Response.ok(icon.getIcon(), Optional.ofNullable(icon.getMediaType()).orElse("image/x-icon"));
+		ResponseBuilder builder = Response.ok(icon.getIcon(), StringUtils.defaultIfBlank(icon.getMediaType(), "image/x-icon"));
 
 		CacheControl cacheControl = new CacheControl();
 		cacheControl.setMaxAge(2592000);