You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/02/11 13:21:19 UTC
cassandra git commit: Fix HSHA/offheap_objects corruption
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1.3 [created] 7cc1cf000
Fix HSHA/offheap_objects corruption
patch by benedict; reviewed by marcus for CASSANDRA-8719
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7cc1cf00
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7cc1cf00
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7cc1cf00
Branch: refs/heads/cassandra-2.1.3
Commit: 7cc1cf000c6b48bc13aa551467f27e4ab28b2031
Parents: fd6f9c6
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Feb 11 11:21:12 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Feb 11 15:19:22 2015 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/utils/memory/MemoryUtil.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7cc1cf00/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d44d70d..954fa3f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.3
+ * Fix HSHA/offheap_objects corruption (CASSANDRA-8719)
* Upgrade libthrift to 0.9.2 (CASSANDRA-8685)
* Don't use the shared ref in sstableloader (CASSANDRA-8704)
* Purge internal prepared statements if related tables or
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7cc1cf00/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java b/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java
index 129a60b..57edc52 100644
--- a/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java
+++ b/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java
@@ -243,7 +243,7 @@ public abstract class MemoryUtil
if (buffer.isDirect())
setBytes(unsafe.getLong(buffer, DIRECT_BYTE_BUFFER_ADDRESS_OFFSET) + start, address, count);
else
- setBytes(address, buffer.array(), start, count);
+ setBytes(address, buffer.array(), buffer.arrayOffset() + start, count);
}
/**