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/9dc4c16d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9dc4c16d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9dc4c16d Branch: refs/heads/trunk Commit: 9dc4c16d7e535eaed36ad112986304812d6147be Parents: c8b220b 572cddc Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Aug 21 12:31:17 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Aug 21 12:31:17 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9dc4c16d/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java index 2f5e5ca,fb32043..438d90f --- a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java +++ b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java @@@ -117,13 -117,13 +117,13 @@@ public class OffHeapBitSet implements I return type.sizeof((int) bytes.size()) + bytes.size(); } - public static OffHeapBitSet deserialize(DataInput dis) throws IOException + public static OffHeapBitSet deserialize(DataInput in) throws IOException { - int byteCount = in.readInt() * 8; - long byteCount = dis.readInt() * 8L; ++ long byteCount = in.readInt() * 8L; Memory memory = RefCountedMemory.allocate(byteCount); - for (int i = 0; i < byteCount;) + for (long i = 0; i < byteCount;) { - long v = dis.readLong(); + long v = in.readLong(); memory.setByte(i++, (byte) (v >>> 0)); memory.setByte(i++, (byte) (v >>> 8)); memory.setByte(i++, (byte) (v >>> 16));
