Fix missing arrayOffset in FBUtilities.hash patch by Richard Low; reviewed by slebresne for CASSANDRA-4250
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e8685d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e8685d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e8685d8 Branch: refs/heads/trunk Commit: 1e8685d836fee9f65f976d4587da88bda3dbeca2 Parents: 59a0421 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed May 16 11:55:12 2012 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed May 16 11:55:12 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/utils/FBUtilities.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e8685d8/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 211314f..4f1046b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -45,6 +45,7 @@ * (cql3) Don't return range ghosts anymore (CASSANDRA-3982) * fix the problem re-creating Keyspace/ColumnFamily (CASSANDRA-4219) * fix SecondaryIndex LelevedManifest save upon snapshot (CASSANDRA-4230) + * fix missing arrayOffset in FBUtilities.hash (CASSANDRA-4250) Merged from 1.0: * Fix super columns bug where cache is not updated (CASSANDRA-4190) * fix maxTimestamp to include row tombstones (CASSANDRA-4116) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e8685d8/src/java/org/apache/cassandra/utils/FBUtilities.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java b/src/java/org/apache/cassandra/utils/FBUtilities.java index c0fe9bd..fb2adfe 100644 --- a/src/java/org/apache/cassandra/utils/FBUtilities.java +++ b/src/java/org/apache/cassandra/utils/FBUtilities.java @@ -221,7 +221,7 @@ public class FBUtilities for (ByteBuffer block : data) { if (block.hasArray()) - messageDigest.update(block.array(), block.position(), block.remaining()); + messageDigest.update(block.array(), block.arrayOffset() + block.position(), block.remaining()); else messageDigest.update(block.duplicate()); }
