Cancel without interruption of currently running tasks

Leave potential interruption up to scheduler shutdown. Closes spring-projectsgh-31019
sdeleuze · Aug 9, 2023 · 6fc5a78 · 6fc5a78
1 parent d58e48d
commit 6fc5a78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.../java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java b/.../java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessor.java
@@ -577,7 +577,7 @@ public void postProcessBeforeDestruction(Object bean, String beanName) {
 		}
 		if (tasks != null) {
 			for (ScheduledTask task : tasks) {
-				task.cancel();
+				task.cancel(false);
 			}
 		}
 	}
@@ -595,7 +595,7 @@ public void destroy() {
 			Collection<Set<ScheduledTask>> allTasks = this.scheduledTasks.values();
 			for (Set<ScheduledTask> tasks : allTasks) {
 				for (ScheduledTask task : tasks) {
-					task.cancel();
+					task.cancel(false);
 				}
 			}
 			this.scheduledTasks.clear();

diff --git a/...g-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java b/...g-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java
@@ -553,7 +553,7 @@ public Set<ScheduledTask> getScheduledTasks() {
 	@Override
 	public void destroy() {
 		for (ScheduledTask task : this.scheduledTasks) {
-			task.cancel();
+			task.cancel(false);
 		}
 		if (this.localExecutor != null) {
 			this.localExecutor.shutdownNow();