Skip to content

S
spring-cloud-netflix
Commit 619580af by Ryan Baxter
Options

Merge remote-tracking branch 'origin/master' into 2.0.x

parents a7675470 5c035768
Showing with 8 additions and 0 deletions
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/security/SecurityContextConcurrencyStrategy.java
...@@ -21,6 +21,7 @@ import java.util.concurrent.Callable; ...@@ -21,6 +21,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import com.netflix.hystrix.HystrixThreadPoolProperties;
import org.springframework.security.concurrent.DelegatingSecurityContextCallable; import org.springframework.security.concurrent.DelegatingSecurityContextCallable;
import com.netflix.hystrix.HystrixThreadPoolKey; import com.netflix.hystrix.HystrixThreadPoolKey;
...@@ -69,6 +70,13 @@ public class SecurityContextConcurrencyStrategy extends HystrixConcurrencyStrate ...@@ -69,6 +70,13 @@ public class SecurityContextConcurrencyStrategy extends HystrixConcurrencyStrate
} }
@Override @Override
public ThreadPoolExecutor getThreadPool(HystrixThreadPoolKey threadPoolKey, HystrixThreadPoolProperties threadPoolProperties) {
return existingConcurrencyStrategy != null
? existingConcurrencyStrategy.getThreadPool(threadPoolKey, threadPoolProperties)
: super.getThreadPool(threadPoolKey, threadPoolProperties);
}
@Override
public <T> Callable<T> wrapCallable(Callable<T> callable) { public <T> Callable<T> wrapCallable(Callable<T> callable) {
return existingConcurrencyStrategy != null return existingConcurrencyStrategy != null
? existingConcurrencyStrategy ? existingConcurrencyStrategy
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment