natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0

This commit is contained in:
Sylvain Lebresne 2012-11-13 20:11:01 +01:00
parent 91a10fa58e 94fa82558f
commit 228d1cf6eb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java vendored
View File

@ -57,7 +57,7 @@ public class ConcurrentLinkedHashCache<K, V> implements ICache<K, V>
{ {
public int weightOf(K key, V value) public int weightOf(K key, V value)
{ {
long size = meter.measure(key) + meter.measure(value); long size = meter.measureDeep(key) + meter.measureDeep(value);
assert size < Integer.MAX_VALUE : "Serialized size cannot be more than 2GB/Integer.MAX_VALUE"; assert size < Integer.MAX_VALUE : "Serialized size cannot be more than 2GB/Integer.MAX_VALUE";
return (int) size; return (int) size;
} }