Skip to content
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

Jump to bottom

Fix Exception in HystrixThreadPoolDefault.touchConfig() on Java 11 #2033

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Exception in HystrixThreadPoolDefault.touchConfig() on Java 11 #2033

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
14 changes: 12 additions & 2 deletions hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,18 @@ private void touchConfig() {
dynamicCoreSize + " and maximumSize = " + configuredMaximumSize + ". Maximum size will be set to " +
dynamicMaximumSize + ", the coreSize value, since it must be equal to or greater than the coreSize value");
}
threadPool.setCorePoolSize(dynamicCoreSize);
threadPool.setMaximumPoolSize(dynamicMaximumSize);
// In JDK 11, setCorePoolSize will not allow a value greater than the current maximumPoolSize.
if (dynamicCoreSize <= threadPool.getMaximumPoolSize()) {
threadPool.setCorePoolSize(dynamicCoreSize);
threadPool.setMaximumPoolSize(dynamicMaximumSize);
} else {
// In JDK 11, setMaximumPoolSize will not allow a value less than the current corePoolSize.
if (dynamicMaximumSize < threadPool.getCorePoolSize()) {
threadPool.setCorePoolSize(1);
}
threadPool.setMaximumPoolSize(dynamicMaximumSize);
threadPool.setCorePoolSize(dynamicCoreSize);
}
}

threadPool.setKeepAliveTime(properties.keepAliveTimeMinutes().get(), TimeUnit.MINUTES);
Expand Down