Merge pull request #1376 from bltb/cleanup-comments

Remove outdated comments regarding thread keep alive.
Netflix · Oct 7, 2016 · ad5e3f4 · ad5e3f4
2 parents 66f1347 + 4bc7b67
commit ad5e3f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPool.java b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPool.java
@@ -224,7 +224,7 @@ private void touchConfig() {
                 threadPool.setMaximumPoolSize(dynamicMaximumSize);
             }
 
-            threadPool.setKeepAliveTime(properties.keepAliveTimeMinutes().get(), TimeUnit.MINUTES); // this doesn't really matter since we're not resizing
+            threadPool.setKeepAliveTime(properties.keepAliveTimeMinutes().get(), TimeUnit.MINUTES);
         }
 
         @Override

diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPoolProperties.java b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPoolProperties.java
@@ -48,7 +48,7 @@ public abstract class HystrixThreadPoolProperties {
 
     /* defaults */
     static int default_coreSize = 10; // core size of thread pool
-    static int default_keepAliveTimeMinutes = 1; // minutes to keep a thread alive (though in practice this doesn't get used as by default we set a fixed size)
+    static int default_keepAliveTimeMinutes = 1; // minutes to keep a thread alive
     static int default_maxQueueSize = -1; // size of queue (this can't be dynamically changed so we use 'queueSizeRejectionThreshold' to artificially limit and reject)
                                                // -1 turns if off and makes us use SynchronousQueue
     static int default_queueSizeRejectionThreshold = 5; // number of items in queue