Permalink
Browse files

merge from 1.2

  • Loading branch information...
2 parents 6f8d737 + 225cb0e commit 3852085a633cbd9bb85607e534f45d295157140f @jbellis jbellis committed Apr 10, 2013
Showing with 4 additions and 1 deletion.
  1. +2 −0 CHANGES.txt
  2. +2 −1 src/java/org/apache/cassandra/service/CacheService.java
View
@@ -37,6 +37,8 @@
* Include fatal errors in trace events (CASSANDRA-5447)
* Ensure that PerRowSecondaryIndex is notified of row-level deletes
(CASSANDRA-5445)
+Merged from 1.1:
+ * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
1.2.4
@@ -335,7 +335,8 @@ public void load(Set<ByteBuffer> buffers, ColumnFamilyStore cfs)
{
DecoratedKey dk = cfs.partitioner.decorateKey(key);
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);
}
}
}

0 comments on commit 3852085

Please sign in to comment.