Merge pull request #897 from mattrjacobs/backport-896

Backport of #896
Netflix · Sep 14, 2015 · c16318b · c16318b
2 parents 0e18402 + 400bf5a
commit c16318b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...ca/src/main/java/com/netflix/hystrix/contrib/javanica/cache/HystrixCacheKeyGenerator.java b/...ca/src/main/java/com/netflix/hystrix/contrib/javanica/cache/HystrixCacheKeyGenerator.java
@@ -58,7 +58,7 @@ public HystrixGeneratedCacheKey generateCacheKey(CacheInvocationContext<? extend
                 StringBuilder cacheKeyBuilder = new StringBuilder();
                 for (CacheInvocationParameter parameter : cacheInvocationContext.getKeyParameters()) {
                     CacheKey cacheKey = parameter.getCacheKeyAnnotation();
-                    if (StringUtils.isNotBlank(cacheKey.value())) {
+                    if (cacheKey != null && StringUtils.isNotBlank(cacheKey.value())) {
                         appendPropertyValue(cacheKeyBuilder, Arrays.asList(StringUtils.split(cacheKey.value(), ".")), parameter.getValue());
                     } else {
                         cacheKeyBuilder.append(parameter.getValue());