From fa90e888f7489e125fca5306bc1ec2856792e15a Mon Sep 17 00:00:00 2001 From: Floens Date: Sat, 28 Apr 2018 18:54:18 +0200 Subject: [PATCH] =?UTF-8?q?site=20resolver:=20add=20null=20check=20when=20?= =?UTF-8?q?resolveLoadable=20returns=20null.=20=EF=9C=88=20#475?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/floens/chan/core/site/SiteResolver.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Clover/app/src/main/java/org/floens/chan/core/site/SiteResolver.java b/Clover/app/src/main/java/org/floens/chan/core/site/SiteResolver.java index 57356a4a..4d180815 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/site/SiteResolver.java +++ b/Clover/app/src/main/java/org/floens/chan/core/site/SiteResolver.java @@ -111,11 +111,13 @@ public class SiteResolver { for (Site site : siteRepository.all().getAll()) { if (site.resolvable().respondsTo(httpUrl)) { - Loadable resolved = loadableProvider.get( - site.resolvable().resolveLoadable(site, httpUrl)); + Loadable resolvedLoadable = site.resolvable().resolveLoadable(site, httpUrl); + if (resolvedLoadable != null) { + Loadable resolved = loadableProvider.get(resolvedLoadable); - if (resolved != null) { - return new LoadableResult(resolved); + if (resolved != null) { + return new LoadableResult(resolved); + } } } }