Merge branch '2.1.x'

This commit is contained in:
Marcin Grzejszczak
2019-11-22 21:33:13 +01:00
2 changed files with 1 additions and 2 deletions

View File

@@ -363,9 +363,7 @@ class LazyTraceScheduledThreadPoolExecutor extends ScheduledThreadPoolExecutor {
}
@Override
@Deprecated
public void finalize() {
super.finalize();
}
@Override

View File

@@ -42,6 +42,7 @@ public class LazyTraceScheduledThreadPoolExecutorTests {
new LazyTraceScheduledThreadPoolExecutor(10, beanFactory, executor).finalize();
BDDAssertions.then(wasCalled).isFalse();
BDDAssertions.then(executor.isShutdown()).isFalse();
}
}