fix npe in CachingQueryRunner

guod08 · Apr 10, 2014 · 69a8723 · 69a8723
1 parent c05f169
commit 69a8723
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/server/src/main/java/io/druid/client/CachingQueryRunner.java b/server/src/main/java/io/druid/client/CachingQueryRunner.java
@@ -84,11 +84,16 @@ public Sequence<T> run(Query<T> query)
         && strategy != null
         && cacheConfig.isPopulateCache();
 
-    final Cache.NamedKey key = CacheUtil.computeSegmentCacheKey(
-        segmentIdentifier,
-        segmentDescriptor,
-        strategy.computeCacheKey(query)
-    );
+    final Cache.NamedKey key;
+    if(strategy != null && (useCache || populateCache)) {
+      key = CacheUtil.computeSegmentCacheKey(
+          segmentIdentifier,
+          segmentDescriptor,
+          strategy.computeCacheKey(query)
+      );
+    } else {
+      key = null;
+    }
 
     if(useCache) {
       final Function cacheFn = strategy.pullFromCache();