Shouldn't call finalize on LazyTraceThreadPoolTaskScheduler delegate
fixes gh-1485
This commit is contained in:
committed by
Marcin Grzejszczak
parent
1cbe0c03b0
commit
247d19f5c8
3
.gitignore
vendored
3
.gitignore
vendored
@@ -21,5 +21,6 @@ _site/
|
||||
/spring-cloud-sleuth-core/nbactions.xml
|
||||
jmh-result.csv
|
||||
pom.xml.versionsBackup
|
||||
.vscode
|
||||
.sts4-cache
|
||||
_includes
|
||||
_includes
|
||||
|
||||
@@ -363,9 +363,7 @@ class LazyTraceScheduledThreadPoolExecutor extends ScheduledThreadPoolExecutor {
|
||||
}
|
||||
|
||||
@Override
|
||||
@Deprecated
|
||||
public void finalize() {
|
||||
ReflectionUtils.invokeMethod(this.finalize, this.delegate);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
/*
|
||||
* Copyright 2013-2019 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.cloud.sleuth.instrument.async;
|
||||
|
||||
import java.util.concurrent.ScheduledThreadPoolExecutor;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import org.assertj.core.api.BDDAssertions;
|
||||
import org.junit.Test;
|
||||
import org.mockito.BDDMockito;
|
||||
|
||||
import org.springframework.beans.factory.BeanFactory;
|
||||
|
||||
public class LazyTraceScheduledThreadPoolExecutorTests {
|
||||
|
||||
@Test
|
||||
public void should_not_finalize_the_delegate_since_its_a_shared_instance() {
|
||||
AtomicBoolean wasCalled = new AtomicBoolean();
|
||||
ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(10) {
|
||||
@Override
|
||||
protected void finalize() {
|
||||
super.finalize();
|
||||
wasCalled.set(true);
|
||||
}
|
||||
};
|
||||
BeanFactory beanFactory = BDDMockito.mock(BeanFactory.class);
|
||||
|
||||
new LazyTraceScheduledThreadPoolExecutor(10, beanFactory, executor).finalize();
|
||||
|
||||
BDDAssertions.then(wasCalled).isFalse();
|
||||
BDDAssertions.then(executor.isShutdown()).isFalse();
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user