Skip to content
Snippets Groups Projects

fix(ScheduledTaskService): [AoU-506] unschedule tasks before deleting them

Merged Nicolas.Rod requested to merge rodn-506-unschedule-deleted-tasks into master
All threads resolved!
1 file
+ 2
5
Compare changes
  • Side-by-side
  • Inline
@@ -62,11 +62,8 @@ public class SchedulerService extends AouService {
if (abstractTaskRunnableOptional.isPresent()) {
ScheduledFuture<AbstractTaskRunnable> scheduledFuture = abstractTaskRunnableOptional.get().getScheduledFuture();
if (!scheduledFuture.isDone() && !scheduledFuture.isCancelled()) {
boolean killRunningTask = false;
if (schedulingCancelType == SchedulingCancelType.INTERRUPT_RUNNING_TASK) {
killRunningTask = true;
}
if (scheduledFuture.cancel(killRunningTask)) {
boolean interruptRunningTask = schedulingCancelType == SchedulingCancelType.INTERRUPT_RUNNING_TASK;
if (scheduledFuture.cancel(interruptRunningTask)) {
this.removeScheduledAbstractTaskRunnable(scheduledTask);
} else {
throw new SolidifyRuntimeException("unable to cancel task '" + scheduledTask.getResId() + "' scheduling");
Loading