Merge pull request #1121 from mattrjacobs/1.4.x-nonstatic-timeout-exc…

…eption Making the HystrixTimeoutException instance per-command, not static
Netflix · Mar 7, 2016 · 5629563 · 5629563
2 parents b3d74a5 + b525240
commit 5629563
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java b/hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java
@@ -931,8 +931,6 @@ protected boolean shouldOutputOnNextEvents() {
         return false;
     }
 
-    private static final HystrixTimeoutException TIMEOUT_EXCEPTION_INSTANCE = new HystrixTimeoutException();
-
     private static class HystrixObservableTimeoutOperator<R> implements Operator<R, R> {
 
         final AbstractCommand<R> originalCommand;
@@ -955,7 +953,7 @@ public Subscriber<? super R> call(final Subscriber<? super R> child) {
 
                 @Override
                 public void run() {
-                    child.onError(TIMEOUT_EXCEPTION_INSTANCE);
+                    child.onError(new HystrixTimeoutException());
                 }
             });