Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[innogysmarthome] Reconnect fix (#8182) #8186

Merged
merged 13 commits into from
Jul 27, 2020
Merged

[innogysmarthome] Reconnect fix (#8182) #8186

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
78699f9
Merge pull request #1 from openhab/2.5.x
Novanic Jun 10, 2020
ae6b891
Merge pull request #2 from openhab/2.5.x
Novanic Jun 12, 2020
66abc11
Merge pull request #3 from openhab/2.5.x
Novanic Jun 13, 2020
4f2cd51
Merge pull request #4 from openhab/2.5.x
Novanic Jun 16, 2020
bd9cfc1
Merge pull request #5 from openhab/2.5.x
Novanic Jun 18, 2020
de62002
Merge pull request #6 from openhab/2.5.x
Novanic Jun 20, 2020
ad272b7
Merge pull request #7 from openhab/2.5.x
Novanic Jun 20, 2020
76c47b8
Merge pull request #8 from openhab/2.5.x
Novanic Jun 21, 2020
2ce668b
Merge pull request #9 from openhab/2.5.x
Novanic Jul 6, 2020
bcfbee2
Merge pull request #10 from openhab/2.5.x
Novanic Jul 10, 2020
2d654b9
Merge pull request #11 from openhab/2.5.x
Novanic Jul 24, 2020
bc6789c
Reconnect fix (isDone was never true, because the scheduled task is e…
sstrohschein Jul 24, 2020
74d7e36
Reconnect fix (isDone was never true, because the scheduled task is e…
sstrohschein Jul 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions ...c/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}