Align task execution tracking and thread interruption on shutdown

Closes gh-35254

Author: jhoeller

spring-context/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java

@@ -376,7 +376,7 @@ public void stop(Runnable callback) {
 
 	@Override
 	public boolean isRunning() {
-		return this.triggerLifecycle.isRunning();
+		return (this.triggerLifecycle.isRunning() || this.fixedDelayLifecycle.isRunning());
 	}
 
 	@Override

spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java

@@ -364,7 +364,6 @@ public void close() {
 			this.active = false;
 			Set<Thread> threads = this.activeThreads;
 			if (threads != null) {
-				threads.forEach(Thread::interrupt);
 				synchronized (threads) {
 					try {
 						if (!threads.isEmpty()) {
@@ -375,6 +374,7 @@ public void close() {
 						Thread.currentThread().interrupt();
 					}
 				}
+				threads.forEach(Thread::interrupt);
 			}
 		}
 	}