Cleans up our button handler lifecycle. (openhab#2437)

Signed-off-by: Dan Cunningham <[email protected]>
ionplay · Jul 16, 2017 · b910739 · b910739
1 parent 40f1c10
commit b910739
Showing 1 changed file with 21 additions and 16 deletions.
diff --git a/...ng.harmonyhub/src/main/java/org/openhab/binding/harmonyhub/handler/HarmonyHubHandler.java b/...ng.harmonyhub/src/main/java/org/openhab/binding/harmonyhub/handler/HarmonyHubHandler.java
@@ -73,7 +73,7 @@ public class HarmonyHubHandler extends BaseBridgeHandler implements HarmonyHubLi
 
     private static final int HEARTBEAT_INTERVAL = 30;
 
-    private ScheduledExecutorService buttonExecutor = Executors.newSingleThreadScheduledExecutor();
+    private ScheduledExecutorService buttonExecutor;
 
     private List<HubStatusListener> listeners = new CopyOnWriteArrayList<HubStatusListener>();
 
@@ -124,14 +124,15 @@ public void handleCommand(ChannelUID channelUID, Command command) {
 
     @Override
     public void initialize() {
+        buttonExecutor = Executors.newSingleThreadScheduledExecutor();
         cancelRetry();
         connect();
     }
 
     @Override
     public void dispose() {
-        listeners.clear();
         buttonExecutor.shutdownNow();
+        listeners.clear();
         cancelRetry();
         disconnectFromHub();
         factory.removeChannelTypesForThing(getThing().getUID());
@@ -331,14 +332,16 @@ public HarmonyClient getClient() {
      * @param button
      */
     public void pressButton(int device, String button) {
-        buttonExecutor.execute(new Runnable() {
-            @Override
-            public void run() {
-                if (client != null) {
-                    client.pressButton(device, button);
+        if (buttonExecutor != null && !buttonExecutor.isShutdown()) {
+            buttonExecutor.execute(new Runnable() {
+                @Override
+                public void run() {
+                    if (client != null) {
+                        client.pressButton(device, button);
+                    }
                 }
-            }
-        });
+            });
+        }
     }
 
     /**
@@ -348,14 +351,16 @@ public void run() {
      * @param button
      */
     public void pressButton(String device, String button) {
-        buttonExecutor.execute(new Runnable() {
-            @Override
-            public void run() {
-                if (client != null) {
-                    client.pressButton(device, button);
+        if (buttonExecutor != null && !buttonExecutor.isShutdown()) {
+            buttonExecutor.execute(new Runnable() {
+                @Override
+                public void run() {
+                    if (client != null) {
+                        client.pressButton(device, button);
+                    }
                 }
-            }
-        });
+            });
+        }
     }
 
     /**