[innogysmarthome] Reconnect fix (openhab#8186)

* Reconnect fix (isDone was never true, because the scheduled task is every time currently running when the scheduleRestartClient method is executed) Closes openhab#8182 Signed-off-by: Sven Strohschein <[email protected]>
andrewfg · Aug 31, 2020 · e3fbc5a · e3fbc5a
1 parent 4b87f43
commit e3fbc5a
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/...c/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandler.java b/...c/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandler.java
@@ -288,9 +288,9 @@ public void onAccessTokenResponse(final AccessTokenResponse credential) {
      * @param seconds
      */
     private synchronized void scheduleRestartClient(final long seconds) {
-        final ScheduledFuture<?> localReinitJob = reinitJob;
+        @Nullable final ScheduledFuture<?> localReinitJob = reinitJob;
 
-        if (localReinitJob != null && !localReinitJob.isDone()) {
+        if (localReinitJob != null && isAlreadyScheduled(localReinitJob)) {
             logger.debug("Scheduling reinitialize in {} seconds - ignored: already triggered in {} seconds.", seconds,
                     localReinitJob.getDelay(TimeUnit.SECONDS));
             return;
@@ -951,4 +951,13 @@ private void refreshAccessToken() {
             logger.debug("Could not refresh tokens", e);
         }
     }
+
+    /**
+     * Checks if the job is already (re-)scheduled.
+     * @param job job to check
+     * @return true, when the job is already (re-)scheduled, otherwise false
+     */
+    private static boolean isAlreadyScheduled(ScheduledFuture<?> job) {
+        return job.getDelay(TimeUnit.SECONDS) > 0;
+    }
 }