merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3852085a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3852085a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3852085a Branch: refs/heads/trunk Commit: 3852085a633cbd9bb85607e534f45d295157140f Parents: 6f8d737 225cb0e Author: Jonathan Ellis <[email protected]> Authored: Tue Apr 9 21:25:52 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Apr 9 21:25:52 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/cassandra/service/CacheService.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3852085a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3852085a/src/java/org/apache/cassandra/service/CacheService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/CacheService.java index e389a5d,bc218c4..c927bfb --- a/src/java/org/apache/cassandra/service/CacheService.java +++ b/src/java/org/apache/cassandra/service/CacheService.java @@@ -334,8 -351,9 +334,9 @@@ public class CacheService implements Ca for (ByteBuffer key : buffers) { DecoratedKey dk = cfs.partitioner.decorateKey(key); - ColumnFamily data = cfs.getTopLevelColumns(QueryFilter.getIdentityFilter(dk, new QueryPath(cfs.columnFamily)), Integer.MIN_VALUE, true); + ColumnFamily data = cfs.getTopLevelColumns(QueryFilter.getIdentityFilter(dk, cfs.name), Integer.MIN_VALUE, true); - rowCache.put(new RowCacheKey(cfs.metadata.cfId, dk), data); + if (data != null) + rowCache.put(new RowCacheKey(cfs.metadata.cfId, dk), data); } } }
