Merge pull request #219 from benjchristensen/context-constructors

Restore HystrixContext* Constructors without ConcurrencyStrategy
Netflix · Mar 11, 2014 · d37a4ed · d37a4ed
2 parents f3ee85c + 07cdcfa
commit d37a4ed
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/.../src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixContexSchedulerAction.java b/.../src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixContexSchedulerAction.java
@@ -22,6 +22,7 @@
 import rx.functions.Action1;
 import rx.functions.Func2;
 
+import com.netflix.hystrix.strategy.HystrixPlugins;
 import com.netflix.hystrix.strategy.concurrency.HystrixContextScheduler.HystrixContextInnerScheduler;
 
 /**
@@ -51,6 +52,10 @@ public class HystrixContexSchedulerAction implements Action1<Inner> {
      */
     private final AtomicReference<Inner> t1Holder = new AtomicReference<Inner>();
 
+    public HystrixContexSchedulerAction(Action1<Inner> action) {
+        this(HystrixPlugins.getInstance().getConcurrencyStrategy(), action);
+    }
+
     public HystrixContexSchedulerAction(final HystrixConcurrencyStrategy concurrencyStrategy, Action1<Inner> action) {
         this.actual = action;
         this.parentThreadState = HystrixRequestContext.getContextForCurrentThread();

diff --git a/...x-core/src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixContextCallable.java b/...x-core/src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixContextCallable.java
@@ -17,6 +17,8 @@
 
 import java.util.concurrent.Callable;
 
+import com.netflix.hystrix.strategy.HystrixPlugins;
+
 /**
  * Wrapper around {@link Callable} that manages the {@link HystrixRequestContext} initialization and cleanup for the execution of the {@link Callable}
  * 
@@ -30,6 +32,10 @@ public class HystrixContextCallable<K> implements Callable<K> {
     private final Callable<K> actual;
     private final HystrixRequestContext parentThreadState;
 
+    public HystrixContextCallable(Callable<K> actual) {
+        this(HystrixPlugins.getInstance().getConcurrencyStrategy(), actual);
+    }
+
     public HystrixContextCallable(HystrixConcurrencyStrategy concurrencyStrategy, Callable<K> actual) {
         this.actual = concurrencyStrategy.wrapCallable(actual);
         this.parentThreadState = HystrixRequestContext.getContextForCurrentThread();

diff --git a/...x-core/src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixContextRunnable.java b/...x-core/src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixContextRunnable.java
@@ -17,6 +17,8 @@
 
 import java.util.concurrent.Callable;
 
+import com.netflix.hystrix.strategy.HystrixPlugins;
+
 /**
  * Wrapper around {@link Runnable} that manages the {@link HystrixRequestContext} initialization and cleanup for the execution of the {@link Runnable}
  * 
@@ -27,6 +29,10 @@ public class HystrixContextRunnable implements Runnable {
     private final Callable<Void> actual;
     private final HystrixRequestContext parentThreadState;
 
+    public HystrixContextRunnable(Runnable actual) {
+        this(HystrixPlugins.getInstance().getConcurrencyStrategy(), actual);
+    }
+
     public HystrixContextRunnable(HystrixConcurrencyStrategy concurrencyStrategy, final Runnable actual) {
         this.actual = concurrencyStrategy.wrapCallable(new Callable<Void>() {