Added a reset of Hystrix.currentCommand to Hystrix.reset()

simonhoo · Jan 14, 2015 · 07ae6d2 · 07ae6d2
1 parent ff0dd95
commit 07ae6d2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/Hystrix.java b/hystrix-core/src/main/java/com/netflix/hystrix/Hystrix.java
@@ -61,6 +61,7 @@ private static void _reset() {
         HystrixCircuitBreaker.Factory.reset();
         HystrixPlugins.reset();
         HystrixPropertiesFactory.reset();
+        currentCommand.set(new LinkedList<HystrixCommandKey>());
     }
 
     private static ThreadLocal<LinkedList<HystrixCommandKey>> currentCommand = new ThreadLocal<LinkedList<HystrixCommandKey>>() {

diff --git a/hystrix-core/src/test/java/com/netflix/hystrix/HystrixTest.java b/hystrix-core/src/test/java/com/netflix/hystrix/HystrixTest.java
@@ -4,12 +4,18 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import com.netflix.hystrix.HystrixCommand.Setter;
 import com.netflix.hystrix.HystrixCommandProperties.ExecutionIsolationStrategy;
 
 public class HystrixTest {
+    @Before
+    public void reset() {
+        Hystrix.reset();
+    }
+
     @Test
     public void testNotInThread() {
         assertNull(Hystrix.getCurrentThreadExecutingCommand());