Updated Branches: refs/heads/trunk 71f5d91ab -> 1124615a6
NPE while loading Saved KeyCache patch by Vijay; reviewed by Jonathan Ellis for CASSANDRA-4553 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1124615a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1124615a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1124615a Branch: refs/heads/trunk Commit: 1124615a65329a4991a5a610fa78af56b0502627 Parents: 71f5d91 Author: vijay2win <[email protected]> Authored: Thu Aug 16 19:29:16 2012 -0700 Committer: vijay2win <[email protected]> Committed: Thu Aug 16 19:29:16 2012 -0700 ---------------------------------------------------------------------- .../apache/cassandra/cache/AutoSavingCache.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1124615a/src/java/org/apache/cassandra/cache/AutoSavingCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/AutoSavingCache.java b/src/java/org/apache/cassandra/cache/AutoSavingCache.java index db872a4..ec054fb 100644 --- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java +++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java @@ -137,6 +137,9 @@ public class AutoSavingCache<K extends CacheKey, V> extends InstrumentingCache<K while (in.available() > 0) { Pair<K, V> entry = cacheLoader.deserialize(in, cfs); + // Key cache entry can return null, if the SSTable doesn't exist. + if (entry == null) + continue; put(entry.left, entry.right); count++; }
