Merge pull request #2163 from arunans23/task

Improve StartupController to delete pending tasks
wso2 · Mar 20, 2024 · dfc3782 · dfc3782
2 parents 7b53750 + 36e8d7e
commit dfc3782
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/modules/core/src/main/java/org/apache/synapse/startup/quartz/StartUpController.java b/modules/core/src/main/java/org/apache/synapse/startup/quartz/StartUpController.java
@@ -76,7 +76,7 @@ public void destroy(boolean removeTask) {
         }        
         if (synapseTaskManager.isInitialized()) {
             TaskScheduler taskScheduler = synapseTaskManager.getTaskScheduler();
-            if (taskScheduler != null && taskScheduler.isInitialized() && removeTask) {
+            if (taskScheduler != null && taskScheduler.isTaskSchedulerInitialized() && removeTask) {
                 taskScheduler.deleteTask(taskDescription.getName(), taskDescription.getTaskGroup());
             }
             TaskDescriptionRepository repository = synapseTaskManager.getTaskDescriptionRepository();

diff --git a/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java b/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java
@@ -159,6 +159,12 @@ public boolean isInitialized() {
         }
     }
 
+    public boolean isTaskSchedulerInitialized() {
+        synchronized (lock) {
+            return initialized;
+        }
+    }
+
     public void deleteTask(String name, String group) {
         synchronized (lock) {
             if (!initialized) {