Skip to content

Commit c23fd78

Browse files
committed
Consistently apply TaskDecorator to ManagedExecutorService as well
Closes gh-32455
1 parent 68a3993 commit c23fd78

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

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

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -143,11 +143,6 @@ public final Executor getConcurrentExecutor() {
143143
* execution callback (which may be a wrapper around the user-supplied task).
144144
* <p>The primary use case is to set some execution context around the task's
145145
* invocation, or to provide some monitoring/statistics for task execution.
146-
* <p><b>NOTE:</b> Exception handling in {@code TaskDecorator} implementations
147-
* is limited to plain {@code Runnable} execution via {@code execute} calls.
148-
* In case of {@code #submit} calls, the exposed {@code Runnable} will be a
149-
* {@code FutureTask} which does not propagate any exceptions; you might
150-
* have to cast it and call {@code Future#get} to evaluate exceptions.
151146
* @since 4.3
152147
*/
153148
public final void setTaskDecorator(TaskDecorator taskDecorator) {
@@ -188,11 +183,10 @@ public <T> ListenableFuture<T> submitListenable(Callable<T> task) {
188183
}
189184

190185

191-
private TaskExecutorAdapter getAdaptedExecutor(Executor concurrentExecutor) {
192-
if (managedExecutorServiceClass != null && managedExecutorServiceClass.isInstance(concurrentExecutor)) {
193-
return new ManagedTaskExecutorAdapter(concurrentExecutor);
194-
}
195-
TaskExecutorAdapter adapter = new TaskExecutorAdapter(concurrentExecutor);
186+
private TaskExecutorAdapter getAdaptedExecutor(Executor originalExecutor) {
187+
TaskExecutorAdapter adapter =
188+
(managedExecutorServiceClass != null && managedExecutorServiceClass.isInstance(originalExecutor) ?
189+
new ManagedTaskExecutorAdapter(originalExecutor) : new TaskExecutorAdapter(originalExecutor));
196190
if (this.taskDecorator != null) {
197191
adapter.setTaskDecorator(this.taskDecorator);
198192
}

0 commit comments

Comments
 (0)