Only check KeyCache when it is enabled

patch by Chris Burroughs; reviewed by Robert Stupp for CASSANDRA-9872
tjake · Aug 31, 2015 · 8a8a5a4 · 8a8a5a4
1 parent 264cf36
commit 8a8a5a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.10
+ * Only check KeyCache when it is enabled
  * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)
  * (cqlsh) update list of CQL keywords (CASSANDRA-9232)
 

diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -1539,7 +1539,7 @@ public RowIndexEntry getCachedPosition(DecoratedKey key, boolean updateStats)
 
     private RowIndexEntry getCachedPosition(KeyCacheKey unifiedKey, boolean updateStats)
     {
-        if (keyCache != null && keyCache.getCapacity() > 0) {
+        if (keyCache != null && keyCache.getCapacity() > 0 && metadata.getCaching().keyCache.isEnabled()) {
             if (updateStats)
             {
                 RowIndexEntry cachedEntry = keyCache.get(unifiedKey);