garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

prevent NPE if icon.getMediaType() is ""

Browse Source
This commit is contained in:
Athou
2021-12-23 16:15:26 +01:00
parent 22beeabb9b
commit 99d80df76c
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/commafeed/frontend/resource/FeedREST.java
View File

@@ -10,7 +10,6 @@ import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.inject.Inject; import javax.inject.Inject;
@@ -361,7 +360,7 @@ public class FeedREST {
Feed feed = subscription.getFeed(); Feed feed = subscription.getFeed();
Favicon icon = feedService.fetchFavicon(feed); 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 cacheControl = new CacheControl();
cacheControl.setMaxAge(2592000); cacheControl.setMaxAge(2592000);