Skip to content

Commit

Permalink
Fix to prevent override a implicit AsyncTaskExecutor (opentracing-con…
Browse files Browse the repository at this point in the history
  • Loading branch information
single-wolf committed Jan 20, 2021
1 parent 76fc7de commit 4eb9a64
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
import org.springframework.core.task.SimpleAsyncTaskExecutor;
import org.springframework.core.task.TaskExecutor;
import org.springframework.scheduling.annotation.AsyncConfigurer;
import org.springframework.scheduling.annotation.AsyncConfigurerSupport;
import org.springframework.scheduling.annotation.EnableAsync;
Expand All @@ -47,7 +48,7 @@ public class DefaultAsyncAutoConfiguration {
private Tracer tracer;

@Configuration
@ConditionalOnMissingBean(AsyncConfigurer.class)
@ConditionalOnMissingBean({AsyncConfigurer.class, TaskExecutor.class, Executor.class})
static class DefaultTracedAsyncConfigurerSupport extends AsyncConfigurerSupport {

@Autowired
Expand Down

0 comments on commit 4eb9a64

Please sign in to comment.