Skip to content

Commit

Permalink
Merge pull request Netflix#1206 from mattrjacobs/add-subscribe-on-to-…
Browse files Browse the repository at this point in the history
…jmh-test

Added subscribeOn to HystrixObservableCommand in JMH test to make it async
  • Loading branch information
mattrjacobs committed May 13, 2016
2 parents ee47e40 + f61542a commit 9f64774
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public Observable<Integer> call() {
Blackhole.consumeCPU(blackholeConsumption);
return Observable.just(1);
}
});
}).subscribeOn(Schedulers.computation());
}
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ protected AbstractCommand(HystrixCommandGroupKey group, HystrixCommandKey key, H
this.circuitBreaker = initCircuitBreaker(this.properties.circuitBreakerEnabled().get(), circuitBreaker, this.commandGroup, this.commandKey, this.properties, this.metrics);
this.threadPool = initThreadPool(threadPool, this.threadPoolKey, threadPoolPropertiesDefaults);


//Strategies from plugins
this.eventNotifier = HystrixPlugins.getInstance().getEventNotifier();
this.concurrencyStrategy = HystrixPlugins.getInstance().getConcurrencyStrategy();
Expand Down

0 comments on commit 9f64774

Please sign in to comment.