Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restore HystrixContext* Constructors without ConcurrencyStrategy #219

Merged
merged 1 commit into from
Mar 11, 2014
Merged

Restore HystrixContext* Constructors without ConcurrencyStrategy #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .../src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixContexSchedulerAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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();
Expand Down
6 changes: 6 additions & 0 deletions ...x-core/src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixContextCallable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
*
Expand All @@ -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();
Expand Down
6 changes: 6 additions & 0 deletions ...x-core/src/main/java/com/netflix/hystrix/strategy/concurrency/HystrixContextRunnable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
*
Expand All @@ -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>() {

Expand Down