From abef15a5f7f77ef857650c12f81f01bbc0599b39 Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Tue, 31 Dec 2019 12:53:50 +0100 Subject: [PATCH] Code cleanup --- .../sites/cam4/Cam4FollowedUpdateService.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4FollowedUpdateService.java b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4FollowedUpdateService.java index 4b68232b..97df0221 100644 --- a/client/src/main/java/ctbrec/ui/sites/cam4/Cam4FollowedUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/cam4/Cam4FollowedUpdateService.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.ThreadFactory; import java.util.stream.Collectors; import org.jsoup.nodes.Element; @@ -28,20 +27,17 @@ import okhttp3.Response; public class Cam4FollowedUpdateService extends PaginatedScheduledService { - private static final transient Logger LOG = LoggerFactory.getLogger(Cam4FollowedUpdateService.class); + private static final Logger LOG = LoggerFactory.getLogger(Cam4FollowedUpdateService.class); private Cam4 site; private boolean showOnline = true; public Cam4FollowedUpdateService(Cam4 site) { this.site = site; - ExecutorService executor = Executors.newSingleThreadExecutor(new ThreadFactory() { - @Override - public Thread newThread(Runnable r) { - Thread t = new Thread(r); - t.setDaemon(true); - t.setName("ThumbOverviewTab UpdateService"); - return t; - } + ExecutorService executor = Executors.newSingleThreadExecutor(r -> { + Thread t = new Thread(r); + t.setDaemon(true); + t.setName("ThumbOverviewTab UpdateService"); + return t; }); setExecutor(executor); } @@ -75,7 +71,11 @@ public class Cam4FollowedUpdateService extends PaginatedScheduledService { .filter(m -> { try { return m.isOnline() == showOnline; - } catch (IOException | ExecutionException | InterruptedException e) { + } catch (IOException | ExecutionException e) { + LOG.error("Couldn't determine online state", e); + return false; + } catch(InterruptedException e) { + Thread.currentThread().interrupt(); LOG.error("Couldn't determine online state", e); return false; }