Merge pull request #1093 from caarlos0/request-cache

Fixed NPE on request cache when HystrixRequestContext is not initialized
Netflix · Feb 8, 2016 · ec642b0 · ec642b0
2 parents 1b4c676 + 6363051
commit ec642b0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixRequestCache.java b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixRequestCache.java
@@ -23,6 +23,7 @@
 import rx.Observable;
 
 import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy;
+import com.netflix.hystrix.strategy.concurrency.HystrixRequestContext;
 import com.netflix.hystrix.strategy.concurrency.HystrixRequestVariableDefault;
 import com.netflix.hystrix.strategy.concurrency.HystrixRequestVariableHolder;
 import com.netflix.hystrix.strategy.concurrency.HystrixRequestVariableLifecycle;
@@ -100,6 +101,9 @@ private static HystrixRequestCache getInstance(RequestCacheKey rcKey, HystrixCon
     /* package */<T> Observable<T> get(String cacheKey) {
         ValueCacheKey key = getRequestCacheKey(cacheKey);
         if (key != null) {
+            if (!HystrixRequestContext.isCurrentThreadInitialized()) {
+                throw new IllegalStateException("Request caching is not available. Maybe you need to initialize the HystrixRequestContext?");
+            }
             /* look for the stored value */
             return (Observable<T>) requestVariableForCache.get(concurrencyStrategy).get(key);
         }

diff --git a/hystrix-core/src/test/java/com/netflix/hystrix/HystrixRequestCacheTest.java b/hystrix-core/src/test/java/com/netflix/hystrix/HystrixRequestCacheTest.java
@@ -66,6 +66,14 @@ public void testCache() {
         }
     }
 
+    @Test(expected = IllegalStateException.class)
+    public void testCacheWithoutContext() {
+        HystrixRequestCache.getInstance(
+            HystrixCommandKey.Factory.asKey("command1"),
+            HystrixConcurrencyStrategyDefault.getInstance()
+        ).get("any");
+    }
+
     @Test
     public void testClearCache() {
         HystrixConcurrencyStrategy strategy = HystrixConcurrencyStrategyDefault.getInstance();