You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/07/03 14:41:32 UTC
[14/40] storm git commit: [STORM-2467] Use explicit charset when
decoding from array backed buffer
[STORM-2467] Use explicit charset when decoding from array backed buffer
We had the case that this broke encoding for us because it used the default
system locale. Given the fact that this code uses an explicit encoding for the
other case and that it evolved from something that always used an explicit
encoding I believe this is more correct.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cf4d9e1e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cf4d9e1e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cf4d9e1e
Branch: refs/heads/1.1.x-branch
Commit: cf4d9e1eb6f8d75092527255e3ff21c23d354ac1
Parents: d887036
Author: Marcus Thiesen <mt...@hubrick.com>
Authored: Tue Apr 11 10:02:38 2017 +0200
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Jun 29 16:32:37 2017 +0900
----------------------------------------------------------------------
.../storm-kafka/src/jvm/org/apache/storm/kafka/StringScheme.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/cf4d9e1e/external/storm-kafka/src/jvm/org/apache/storm/kafka/StringScheme.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/jvm/org/apache/storm/kafka/StringScheme.java b/external/storm-kafka/src/jvm/org/apache/storm/kafka/StringScheme.java
index e2a2c22..b0b8d27 100644
--- a/external/storm-kafka/src/jvm/org/apache/storm/kafka/StringScheme.java
+++ b/external/storm-kafka/src/jvm/org/apache/storm/kafka/StringScheme.java
@@ -38,7 +38,7 @@ public class StringScheme implements Scheme {
public static String deserializeString(ByteBuffer string) {
if (string.hasArray()) {
int base = string.arrayOffset();
- return new String(string.array(), base + string.position(), string.remaining());
+ return new String(string.array(), base + string.position(), string.remaining(), UTF8_CHARSET);
} else {
return new String(Utils.toByteArray(string), UTF8_CHARSET);
}