Handle coreSize > maximumSize in HystrixThreadPoolConfiguration

rwilliams-r7 · Dec 19, 2016 · a37ff8c · a37ff8c
1 parent 9ab65f1
commit a37ff8c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/config/HystrixThreadPoolConfiguration.java b/hystrix-core/src/main/java/com/netflix/hystrix/config/HystrixThreadPoolConfiguration.java
@@ -35,12 +35,20 @@ public HystrixThreadPoolConfiguration(HystrixThreadPoolKey threadPoolKey, int co
                                            int keepAliveTimeInMinutes, boolean allowMaximumSizeToDivergeFromCoreSize, int rollingCounterNumberOfBuckets,
                                            int rollingCounterBucketSizeInMilliseconds) {
         this.threadPoolKey = threadPoolKey;
+        this.allowMaximumSizeToDivergeFromCoreSize = allowMaximumSizeToDivergeFromCoreSize;
         this.coreSize = coreSize;
-        this.maximumSize = maximumSize;
+        if (allowMaximumSizeToDivergeFromCoreSize) {
+            if (coreSize > maximumSize) {
+                this.maximumSize = coreSize;
+            } else {
+                this.maximumSize = maximumSize;
+            }
+        } else {
+            this.maximumSize = coreSize;
+        }
         this.maxQueueSize = maxQueueSize;
         this.queueRejectionThreshold = queueRejectionThreshold;
         this.keepAliveTimeInMinutes = keepAliveTimeInMinutes;
-        this.allowMaximumSizeToDivergeFromCoreSize = allowMaximumSizeToDivergeFromCoreSize;
         this.rollingCounterNumberOfBuckets = rollingCounterNumberOfBuckets;
         this.rollingCounterBucketSizeInMilliseconds = rollingCounterBucketSizeInMilliseconds;
     }