From 2ab695f308533d737086be39a171cfc6d59d8450 Mon Sep 17 00:00:00 2001 From: catbref Date: Wed, 6 May 2020 11:58:02 +0100 Subject: [PATCH] NTP: don't call shutdownNow() on null instanceExecutor When using fixed NTP offset, e.g. via "testNtpoffset" in settings.json, Controller calls NTP.shutdownNow() which throws a NPE because NTP.instanceExecutor is null. --- src/main/java/org/qortal/utils/NTP.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/qortal/utils/NTP.java b/src/main/java/org/qortal/utils/NTP.java index cc6dec56..b141ed96 100644 --- a/src/main/java/org/qortal/utils/NTP.java +++ b/src/main/java/org/qortal/utils/NTP.java @@ -129,7 +129,8 @@ public class NTP implements Runnable { } public static void shutdownNow() { - instanceExecutor.shutdownNow(); + if (instanceExecutor != null) + instanceExecutor.shutdownNow(); } public static synchronized void setFixedOffset(Long offset) {