Merge pull request #885 from mattrjacobs/single-lookup-of-request-cache

Only lookup if the request cache is enabled once per command invocation

hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java

@@ -110,7 +110,6 @@ protected static enum TimedOutStatus {
     protected final AtomicBoolean isExecutedInThread = new AtomicBoolean(false);
     protected final AtomicReference<Action0> endCurrentThreadExecutingCommand = new AtomicReference<Action0>(); // don't like how this is being done
 
-
     /**
      * Instance of RequestCache logic
      */
@@ -354,8 +353,10 @@ public Observable<R> toObservable() {
             throw new IllegalStateException("This instance can only be executed once. Please instantiate a new instance.");
         }
 
+        final boolean requestCacheEnabled = isRequestCachingEnabled();
+
         /* try from cache first */
-        if (isRequestCachingEnabled()) {
+        if (requestCacheEnabled) {
             Observable<R> fromCache = requestCache.get(getCacheKey());
             if (fromCache != null) {
                 /* mark that we received this response from cache */
@@ -475,7 +476,7 @@ public void call() {
         });
 
         // put in cache
-        if (isRequestCachingEnabled()) {
+        if (requestCacheEnabled) {
             // wrap it for caching
             o = new CachedObservableOriginal<R>(o.cache(), this);
             Observable<R> fromCache = requestCache.putIfAbsent(getCacheKey(), o);