diff --git a/common/network-common/src/main/java/org/apache/spark/network/ssl/ReloadingX509TrustManager.java b/common/network-common/src/main/java/org/apache/spark/network/ssl/ReloadingX509TrustManager.java index 6572506f38df5..18618e7d5c8be 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/ssl/ReloadingX509TrustManager.java +++ b/common/network-common/src/main/java/org/apache/spark/network/ssl/ReloadingX509TrustManager.java @@ -61,7 +61,6 @@ public final class ReloadingX509TrustManager protected volatile int needsReloadCheckCounts; private final AtomicReference trustManagerRef; - private volatile boolean running; private Thread reloader; /** @@ -98,7 +97,6 @@ public ReloadingX509TrustManager( public void init() { reloader = new Thread(this, "Truststore reloader thread"); reloader.setDaemon(true); - running = true; reloader.start(); } @@ -106,7 +104,6 @@ public void init() { * Stops the reloader thread. */ public void destroy() throws InterruptedException { - running = false; reloader.interrupt(); reloader.join(); } @@ -200,11 +197,12 @@ X509TrustManager loadTrustManager() @Override public void run() { + boolean running = true; while (running) { try { Thread.sleep(reloadInterval); } catch (InterruptedException e) { - //NOP + running = false; } try { if (running && needsReload()) {