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

Make HystrixCommand.execute()/queue() and AbstractCommand.observe()/toObservable() nonfinal #716

Merged
merged 1 commit into from
Mar 20, 2015
+4 −4
Merged

Make HystrixCommand.execute()/queue() and AbstractCommand.observe()/toObservable() nonfinal #716

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
4 changes: 2 additions & 2 deletions hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ protected AbstractCommand(HystrixCommandGroupKey group, HystrixCommandKey key, H
* @throws IllegalStateException
* if invoked more than once
*/
final public Observable<R> observe() {
public Observable<R> observe() {
// us a ReplaySubject to buffer the eagerly subscribed-to Observable
ReplaySubject<R> subject = ReplaySubject.create();
// eagerly kick off subscription
Expand Down Expand Up @@ -342,7 +342,7 @@ final public Observable<R> observe() {
* @throws IllegalStateException
* if invoked more than once
*/
final public Observable<R> toObservable() {
public Observable<R> toObservable() {
/* this is a stateful object so can only be used once */
if (!started.compareAndSet(false, true)) {
throw new IllegalStateException("This instance can only be executed once. Please instantiate a new instance.");
Expand Down
4 changes: 2 additions & 2 deletions hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ public void call(Subscriber<? super R> s) {
* @throws IllegalStateException
* if invoked more than once
*/
final public R execute() {
public R execute() {
try {
return queue().get();
} catch (Exception e) {
Expand Down Expand Up @@ -360,7 +360,7 @@ final public R execute() {
* @throws IllegalStateException
* if invoked more than once
*/
final public Future<R> queue() {
public Future<R> queue() {
/*
* --- Schedulers.immediate()
*
Expand Down