Shouldn't call finalize on LazyTraceThreadPoolTaskScheduler delegate; fixes gh-1485

This commit is contained in:
Marcin Grzejszczak
2019-11-20 11:18:40 +01:00
parent ec9e8319e9
commit b564361111
3 changed files with 49 additions and 1 deletions

1
.gitignore vendored
View File

@@ -23,3 +23,4 @@ jmh-result.csv
pom.xml.versionsBackup
.vscode
.sts4-cache
_includes

View File

@@ -365,7 +365,7 @@ class LazyTraceScheduledThreadPoolExecutor extends ScheduledThreadPoolExecutor {
@Override
@Deprecated
public void finalize() {
ReflectionUtils.invokeMethod(this.finalize, this.delegate);
super.finalize();
}
@Override

View File

@@ -0,0 +1,47 @@
/*
* 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();
}
}