Repository: cassandra Updated Branches: refs/heads/trunk fa92ae66d -> 4901af68a
Merge from 3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4901af68 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4901af68 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4901af68 Branch: refs/heads/trunk Commit: 4901af68aa12c9a482c5e8c4ef7e7d0fb23a5afe Parents: fa92ae6 Author: Sylvain Lebresne <[email protected]> Authored: Thu Nov 26 15:45:31 2015 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Nov 26 15:45:31 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/utils/MD5Digest.java | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4901af68/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 37e60cb..41609cf 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -28,6 +28,7 @@ Merged from 2.2: * (Hadoop) fix splits calculation (CASSANDRA-10640) * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) Merged from 2.1: + * Force encoding when computing statement ids (CASSANDRA-10755) * Properly reject counters as map keys (CASSANDRA-10760) * Fix the sstable-needs-cleanup check (CASSANDRA-10740) * (cqlsh) Print column names before COPY operation (CASSANDRA-8935) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4901af68/src/java/org/apache/cassandra/utils/MD5Digest.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/MD5Digest.java b/src/java/org/apache/cassandra/utils/MD5Digest.java index 3f46458..2dc57de 100644 --- a/src/java/org/apache/cassandra/utils/MD5Digest.java +++ b/src/java/org/apache/cassandra/utils/MD5Digest.java @@ -17,6 +17,7 @@ */ package org.apache.cassandra.utils; +import java.io.UnsupportedEncodingException; import java.util.Arrays; /** @@ -50,7 +51,14 @@ public class MD5Digest public static MD5Digest compute(String toHash) { - return compute(toHash.getBytes()); + try + { + return compute(toHash.getBytes("UTF-8")); + } + catch (UnsupportedEncodingException e) + { + throw new RuntimeException(e.getMessage()); + } } @Override
