From f740a93b6c0386ad8a3f4b3cdf2a10efd331a767 Mon Sep 17 00:00:00 2001 From: JaniruTEC Date: Fri, 27 May 2022 01:23:06 +0200 Subject: [PATCH] Applied suggestions from code review Changed signature of afterExecuteTask See: https://github.com/cryptomator/cryptomator/pull/2259/files#r875548549 -- Changed name of "afterExecute0" to "afterExecuteInternal" See: https://github.com/cryptomator/cryptomator/pull/2259/files#r875551994 --- .../org/cryptomator/common/CatchingExecutors.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/cryptomator/common/CatchingExecutors.java b/src/main/java/org/cryptomator/common/CatchingExecutors.java index 469fc3741..900f81ec9 100644 --- a/src/main/java/org/cryptomator/common/CatchingExecutors.java +++ b/src/main/java/org/cryptomator/common/CatchingExecutors.java @@ -31,7 +31,7 @@ public final class CatchingExecutors { @Override protected void afterExecute(Runnable runnable, Throwable throwable) { super.afterExecute(runnable, throwable); - afterExecute0(runnable, throwable); + afterExecuteInternal(runnable, throwable); } } @@ -44,15 +44,15 @@ public final class CatchingExecutors { @Override protected void afterExecute(Runnable runnable, Throwable throwable) { super.afterExecute(runnable, throwable); - afterExecute0(runnable, throwable); + afterExecuteInternal(runnable, throwable); } } - private static void afterExecute0(Runnable runnable, Throwable throwable) { + private static void afterExecuteInternal(Runnable runnable, Throwable throwable) { if (throwable != null) { callHandler(Thread.currentThread(), throwable); } else if (runnable instanceof Task t) { - afterExecuteTask(Thread.currentThread(), t); + afterExecuteTask(t); } else if (runnable instanceof Future f) { afterExecuteFuture(f); } @@ -67,7 +67,8 @@ public final class CatchingExecutors { return (thread, throwable) -> LOG.error("FALLBACK: Uncaught exception in " + thread.getName(), throwable); } - private static void afterExecuteTask(Thread caller, Task task) { + private static void afterExecuteTask(Task task) { + var caller = Thread.currentThread(); Platform.runLater(() -> { if (task.getOnFailed() == null) { callHandler(caller, task.getException());