Skip to content

Fix static ExecutorService ClassLoader leak in AsyncFeign #3277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
velo wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −22
Open

Fix static ExecutorService ClassLoader leak in AsyncFeign #3277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions core/src/main/java/feign/AsyncFeign.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,23 +55,20 @@ public static <C> AsyncBuilder<C> asyncBuilder() {
return builder();
}

private static class LazyInitializedExecutorService {

private static final ExecutorService instance =
Executors.newCachedThreadPool(
r -> {
final Thread result = new Thread(r);
result.setDaemon(true);
return result;
});
private static ExecutorService newDefaultExecutorService() {
return Executors.newCachedThreadPool(
r -> {
final Thread result = new Thread(r);
result.setDaemon(true);
return result;
});
}

public static class AsyncBuilder<C> extends BaseBuilder<AsyncBuilder<C>, AsyncFeign<C>> {

private AsyncContextSupplier<C> defaultContextSupplier = () -> null;
private AsyncClient<C> client =
new DefaultAsyncClient<>(
new DefaultClient(null, null), LazyInitializedExecutorService.instance);
new DefaultAsyncClient<>(new DefaultClient(null, null), newDefaultExecutorService());
private MethodInfoResolver methodInfoResolver = MethodInfo::new;

@Deprecated
Expand Down
19 changes: 8 additions & 11 deletions kotlin/src/main/java/feign/kotlin/CoroutineFeign.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,13 @@ public static <C> CoroutineBuilder<C> coBuilder() {
return builder();
}

private static class LazyInitializedExecutorService {

private static final ExecutorService instance =
Executors.newCachedThreadPool(
r -> {
final Thread result = new Thread(r);
result.setDaemon(true);
return result;
});
private static ExecutorService newDefaultExecutorService() {
return Executors.newCachedThreadPool(
r -> {
final Thread result = new Thread(r);
result.setDaemon(true);
return result;
});
}

private static class CoroutineFeignInvocationHandler<T> implements InvocationHandler {
Expand Down Expand Up @@ -119,8 +117,7 @@ public static class CoroutineBuilder<C>

private AsyncContextSupplier<C> defaultContextSupplier = () -> null;
private AsyncClient<C> client =
new DefaultAsyncClient<>(
new DefaultClient(null, null), LazyInitializedExecutorService.instance);
new DefaultAsyncClient<>(new DefaultClient(null, null), newDefaultExecutorService());
private MethodInfoResolver methodInfoResolver = KotlinMethodInfo::createInstance;

@Deprecated
Expand Down