Merge pull request Netflix#1587 from jack-kerouac/patch-1

throw IllegalStateException if request cache is not available when clearing
xingjin · May 31, 2017 · ea14be2 · ea14be2
2 parents dbc7429 + 45d7875
commit ea14be2
Showing 1 changed file with 7 additions and 2 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
@@ -129,7 +129,7 @@ private static HystrixRequestCache getInstance(RequestCacheKey rcKey, HystrixCon
             /* look for the stored value */
             ConcurrentHashMap<ValueCacheKey, HystrixCachedObservable<?>> cacheInstance = requestVariableForCache.get(concurrencyStrategy);
             if (cacheInstance == null) {
-                throw new IllegalStateException("Request caching is not available.  Maybe you need to initialize the HystrixRequestContext?");
+                throw new IllegalStateException("Request caching is not available. Maybe you need to initialize the HystrixRequestContext?");
             }
             HystrixCachedObservable<T> alreadySet = (HystrixCachedObservable<T>) cacheInstance.putIfAbsent(key, f);
             if (alreadySet != null) {
@@ -150,8 +150,13 @@ private static HystrixRequestCache getInstance(RequestCacheKey rcKey, HystrixCon
     public void clear(String cacheKey) {
         ValueCacheKey key = getRequestCacheKey(cacheKey);
         if (key != null) {
+            ConcurrentHashMap<ValueCacheKey, HystrixCachedObservable<?>> cacheInstance = requestVariableForCache.get(concurrencyStrategy);
+            if (cacheInstance == null) {
+                throw new IllegalStateException("Request caching is not available. Maybe you need to initialize the HystrixRequestContext?");
+            }
+
             /* remove this cache key */
-            requestVariableForCache.get(concurrencyStrategy).remove(key);
+            cacheInstance.remove(key);
         }
     }