Merge branch 'master' into 2.0.x

This commit is contained in:
Marcin Grzejszczak
2017-06-27 13:52:44 +02:00

View File

@@ -90,6 +90,7 @@ public class LazyTraceThreadPoolTaskExecutor extends ThreadPoolTaskExecutor {
return this.delegate.getThreadPoolExecutor();
}
@Override
public void destroy() {
this.delegate.destroy();
super.destroy();
@@ -101,6 +102,11 @@ public class LazyTraceThreadPoolTaskExecutor extends ThreadPoolTaskExecutor {
super.afterPropertiesSet();
}
@Override
public void shutdown() {
this.delegate.shutdown();
}
private Tracer tracer() {
if (this.tracer == null) {
this.tracer = this.beanFactory.getBean(Tracer.class);