Merge pull request #760 from vspglobal/issue-759

set threads to daemon as per #759
Netflix · Apr 17, 2015 · 8c74e00 · 8c74e00
2 parents 1ebba20 + 5e21ded
commit 8c74e00
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...re/src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixConcurrencyStrategy.java b/...re/src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixConcurrencyStrategy.java
@@ -76,7 +76,9 @@ public ThreadPoolExecutor getThreadPool(final HystrixThreadPoolKey threadPoolKey
 
             @Override
             public Thread newThread(Runnable r) {
-                return new Thread(r, "hystrix-" + threadPoolKey.name() + "-" + threadNumber.incrementAndGet());
+                Thread thread = new Thread(r, "hystrix-" + threadPoolKey.name() + "-" + threadNumber.incrementAndGet());
+                thread.setDaemon(true);
+                return thread; 
             }
         });
     }

diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/util/HystrixTimer.java b/hystrix-core/src/main/java/com/netflix/hystrix/util/HystrixTimer.java
@@ -152,7 +152,9 @@ public void initialize() {
 
                 @Override
                 public Thread newThread(Runnable r) {
-                    return new Thread(r, "HystrixTimer-" + counter.incrementAndGet());
+                    Thread thread = new Thread(r, "HystrixTimer-" + counter.incrementAndGet());
+                    thread.setDaemon(true);
+                    return thread;
                 }
 
             });