diff --git a/src/main/java/org/opensearch/jobscheduler/scheduler/JobScheduler.java b/src/main/java/org/opensearch/jobscheduler/scheduler/JobScheduler.java index faf4f495..ad015f07 100644 --- a/src/main/java/org/opensearch/jobscheduler/scheduler/JobScheduler.java +++ b/src/main/java/org/opensearch/jobscheduler/scheduler/JobScheduler.java @@ -119,13 +119,10 @@ public boolean deschedule(String indexName, String id) { jobInfo.setExpectedPreviousExecutionTime(null); Scheduler.ScheduledCancellable scheduledCancellable = jobInfo.getScheduledCancellable(); - if (scheduledCancellable != null) { - if (scheduledCancellable.cancel()) { - this.scheduledJobInfo.removeJob(indexName, id); - } else { - return false; - } + if (scheduledCancellable != null && scheduledCancellable.cancel() == false) { + return false; } + this.scheduledJobInfo.removeJob(indexName, id); return true; }