From a899696b1a5d97e8f290f2e225080515a4814d61 Mon Sep 17 00:00:00 2001 From: Matt Jacobs Date: Thu, 19 Mar 2015 21:37:09 -0700 Subject: [PATCH] Make HystrixCommand.execute()/queue() and AbstractCommand.observe()/toObservable() nonfinal --- .../src/main/java/com/netflix/hystrix/AbstractCommand.java | 4 ++-- .../src/main/java/com/netflix/hystrix/HystrixCommand.java | 4 ++-- 2 files changed, 4 insertions(+), 4 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 index 0bd908cc7..a1013ce81 100644 --- a/hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java +++ b/hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java @@ -307,7 +307,7 @@ protected AbstractCommand(HystrixCommandGroupKey group, HystrixCommandKey key, H * @throws IllegalStateException * if invoked more than once */ - final public Observable observe() { + public Observable observe() { // us a ReplaySubject to buffer the eagerly subscribed-to Observable ReplaySubject subject = ReplaySubject.create(); // eagerly kick off subscription @@ -342,7 +342,7 @@ final public Observable observe() { * @throws IllegalStateException * if invoked more than once */ - final public Observable toObservable() { + public Observable 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."); diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommand.java b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommand.java index a1b46181e..5a5bfce09 100755 --- a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommand.java +++ b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommand.java @@ -330,7 +330,7 @@ public void call(Subscriber s) { * @throws IllegalStateException * if invoked more than once */ - final public R execute() { + public R execute() { try { return queue().get(); } catch (Exception e) { @@ -360,7 +360,7 @@ final public R execute() { * @throws IllegalStateException * if invoked more than once */ - final public Future queue() { + public Future queue() { /* * --- Schedulers.immediate() *