Merge pull request spring-cloud#2044 from bright/override_all_hystrix…

…_concurrency_strategy_methods Override getThreadPool from HystrixConcurrencyStrategy and delegate to
scottfrederick · Jun 16, 2017 · 9a878b0 · 9a878b0
2 parents aac7799 + 779b026
commit 9a878b0
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/...rg/springframework/cloud/netflix/hystrix/security/SecurityContextConcurrencyStrategy.java b/...rg/springframework/cloud/netflix/hystrix/security/SecurityContextConcurrencyStrategy.java
@@ -21,6 +21,7 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import com.netflix.hystrix.HystrixThreadPoolProperties;
 import org.springframework.security.concurrent.DelegatingSecurityContextCallable;
 
 import com.netflix.hystrix.HystrixThreadPoolKey;
@@ -68,6 +69,13 @@ public ThreadPoolExecutor getThreadPool(HystrixThreadPoolKey threadPoolKey,
 						keepAliveTime, unit, workQueue);
 	}
 
+	@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) {
 		return existingConcurrencyStrategy != null