Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A24331861F for ; Thu, 26 Nov 2015 14:44:56 +0000 (UTC) Received: (qmail 13702 invoked by uid 500); 26 Nov 2015 14:44:56 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 13667 invoked by uid 500); 26 Nov 2015 14:44:56 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 13645 invoked by uid 99); 26 Nov 2015 14:44:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Nov 2015 14:44:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 56D4CE0B70; Thu, 26 Nov 2015 14:44:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Thu, 26 Nov 2015 14:44:56 -0000 Message-Id: <53862cc472e7406381529e0f27b9342f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] cassandra git commit: Force encoding charset when computed prepared statement IDs Repository: cassandra Updated Branches: refs/heads/cassandra-3.1 b7ead2b33 -> 0e5aa51d1 Force encoding charset when computed prepared statement IDs patch by Stefan Podkowinski; reviewed by slebresne for CASSANDRA-10755 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5b9f710 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5b9f710 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5b9f710 Branch: refs/heads/cassandra-3.1 Commit: b5b9f7106d66eda6e41cea292bc569886b701448 Parents: cdf0485 Author: Stefan Podkowinski Authored: Mon Nov 23 17:12:35 2015 +0100 Committer: Sylvain Lebresne Committed: Thu Nov 26 11:02:30 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/b5b9f710/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 7978a56..ee0bc61 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.12 + * 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/b5b9f710/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