Merge branch '6.1.x'

simonbasle · simonbasle · commit 71927b3487db · 2024-08-07T16:07:00.000+02:00
# Conflicts:
#	spring-context/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java
diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java
@@ -227,7 +227,7 @@ private void shutdownAwareErrorHandler(Throwable ex) {
 		if (this.errorHandler != null) {
 			this.errorHandler.handleError(ex);
 		}
-		else if (this.scheduledExecutor.isTerminated()) {
+		else if (this.scheduledExecutor.isShutdown()) {
 			LogFactory.getLog(getClass()).debug("Ignoring scheduled task exception after shutdown", ex);
 		}
 		else {

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ private void shutdownAwareErrorHandler(Throwable ex) {`
`227`	`227`	`if (this.errorHandler != null) {`
`228`	`228`	`this.errorHandler.handleError(ex);`
`229`	`229`	`}`
`230`		`- else if (this.scheduledExecutor.isTerminated()) {`
	`230`	`+ else if (this.scheduledExecutor.isShutdown()) {`
`231`	`231`	`LogFactory.getLog(getClass()).debug("Ignoring scheduled task exception after shutdown", ex);`
`232`	`232`	`}`
`233`	`233`	`else {`