Cleanup and optimize thread pool shutdown, fix "DISCONNECTED" status

csowada · Jan 3, 2020 · 26fc50c · 26fc50c
1 parent 380572e
commit 26fc50c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 28 deletions.
diff --git a/src/main/java/de/csdev/ebus/core/EBusControllerBase.java b/src/main/java/de/csdev/ebus/core/EBusControllerBase.java
@@ -233,18 +233,26 @@ protected void shutdownThreadPool() {
         // shutdown threadpool
         if (threadPool != null && !threadPool.isShutdown()) {
             threadPool.shutdownNow();
+        }
+
+        if (threadPoolWDT != null && !threadPoolWDT.isShutdown()) {
+            threadPoolWDT.shutdownNow();
+        }
+
+        if (threadPool != null) {
             try {
                 // wait up to 10sec. for the thread pool
                 threadPool.awaitTermination(10, TimeUnit.SECONDS);
+                threadPool = null;
             } catch (InterruptedException e) {
             }
         }
 
-        if (threadPoolWDT != null && !threadPoolWDT.isShutdown()) {
-            threadPoolWDT.shutdownNow();
+        if (threadPoolWDT != null) {
             try {
                 // wait up to 10sec. for the thread pool
                 threadPoolWDT.awaitTermination(10, TimeUnit.SECONDS);
+                threadPoolWDT = null;
             } catch (InterruptedException e) {
             }
         }
@@ -276,23 +284,11 @@ protected void dispose() {
     }
 
     protected void resetWatchdogTimer() {
-
-        // logger.info("wdt runn ...");
-
         Runnable r = new Runnable() {
-
             @Override
             public void run() {
                 EBusControllerBase.this.fireWatchDogTimer();
-                // EBusControllerBase.logger.warn("eBUS Watchdog Timer!");
-                //
-                // try {
-                // EBusControllerBase.this.connection.close();
-                // } catch (IOException e) {
-                // logger.error("error!", e);
-                // }
             }
-
         };
 
         if (watchdogTimer != null && !watchdogTimer.isCancelled()) {
@@ -315,15 +311,7 @@ public void setWatchdogTimerTimeout(int seconds) {
         watchdogTimerTimeout = seconds;
     }
 
-    protected void fireWatchDogTimer() {
-        // EBusControllerBase.logger.warn("eBUS Watchdog Timer!");
-        //
-        // try {
-        // EBusControllerBase.this.connection.close();
-        // } catch (IOException e) {
-        // logger.error("error!", e);
-        // }
-    }
+    protected abstract void fireWatchDogTimer();
 
     protected void setConnectionStatus(ConnectionStatus status) {
         this.connectionStatus = status;

diff --git a/src/main/java/de/csdev/ebus/core/EBusLowLevelController.java b/src/main/java/de/csdev/ebus/core/EBusLowLevelController.java
@@ -179,9 +179,6 @@ public void run() {
         resetWatchdogTimer();
 
         // loop until interrupt or reconnector count is -1 (to many retries)
-
-        // while (!Thread.currentThread().isInterrupted() || reConnectCounter != -1) {
-
         while (!(this.isInterrupted() || reConnectCounter == -1)) {
             try {
 
@@ -419,6 +416,9 @@ protected void dispose() {
 
         logger.info("eBUS connection thread is shuting down ...");
 
+        // set connection status to disconnected
+        setConnectionStatus(ConnectionStatus.DISCONNECTED);
+
         super.dispose();
 
         // *******************************
@@ -435,8 +435,6 @@ protected void dispose() {
             logger.error(e.toString(), e);
         }
 
-        // set connection status to disconnected
-        setConnectionStatus(ConnectionStatus.DISCONNECTED);
     }
 
     @Override