Repository: cassandra Updated Branches: refs/heads/trunk ea1d16142 -> a01d2d33d
use CharSet constants Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a01d2d33 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a01d2d33 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a01d2d33 Branch: refs/heads/trunk Commit: a01d2d33d8180b52d038fb151dbd7c6413b34364 Parents: ea1d161 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed May 13 18:21:46 2015 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed May 13 18:23:20 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/marshal/UserType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a01d2d33/src/java/org/apache/cassandra/db/marshal/UserType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/UserType.java b/src/java/org/apache/cassandra/db/marshal/UserType.java index 5879d6b..23e2790 100644 --- a/src/java/org/apache/cassandra/db/marshal/UserType.java +++ b/src/java/org/apache/cassandra/db/marshal/UserType.java @@ -20,6 +20,7 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.*; import com.google.common.base.Objects; @@ -56,7 +57,7 @@ public class UserType extends TupleType { try { - stringFieldNames.add(ByteBufferUtil.string(fieldName, Charset.forName("UTF-8"))); + stringFieldNames.add(ByteBufferUtil.string(fieldName, StandardCharsets.UTF_8)); } catch (CharacterCodingException ex) {