OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix timer cancellation in automation cache (#3204) 

Signed-off-by: Jan N. Klug <github@klug.nrw>
pull/3209/head
J-N-K 2022-12-08 21:38:32 +01:00 committed by GitHub
parent 070a11e593
commit 987cf221d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/CacheScriptExtension.java
View File

@ -19,7 +19,6 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.Timer;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
@ -131,16 +130,23 @@ public class CacheScriptExtension implements ScriptExtensionProvider {
}
/**
* Check if object is {@link ScheduledFuture} or {@link Timer} and schedule cancellation of those jobs
* Check if object is {@link ScheduledFuture}, {@link java.util.Timer} or
* {@link org.openhab.core.automation.module.script.action.Timer} and schedule cancellation of those jobs
*
* @param o the {@link Object} to check
*/
private void asyncCancelJob(@Nullable Object o) {
Runnable cancelJob = null;
if (o instanceof ScheduledFuture) {
scheduler.execute(() -> ((ScheduledFuture<?>) o).cancel(true));
} else if (o instanceof Timer) {
cancelJob = () -> ((ScheduledFuture<?>) o).cancel(true);
} else if (o instanceof java.util.Timer) {
cancelJob = () -> ((java.util.Timer) o).cancel();
} else if (o instanceof org.openhab.core.automation.module.script.action.Timer) {
cancelJob = () -> ((org.openhab.core.automation.module.script.action.Timer) o).cancel();
}
if (cancelJob != null) {
// not using execute so ensure this operates in another thread and we don't block here
scheduler.schedule(() -> ((Timer) o).cancel(), 0, TimeUnit.SECONDS);
scheduler.schedule(cancelJob, 0, TimeUnit.SECONDS);
}
}