Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

Browse Source 
# Conflicts:
#	spring-context/src/main/java/org/springframework/scheduling/concurrent/SimpleAsyncTaskScheduler.java
This commit is contained in:
Simon Baslé
2024-08-07 16:07:00 +02:00
parent 313b063aef 9b85a246d8
commit 71927b3487
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,7 +227,7 @@ public class SimpleAsyncTaskScheduler extends SimpleAsyncTaskExecutor implements
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 {