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/04/14 06:00:39 UTC
[1/3] storm git commit: [STORM-2467] Use explicit charset when
decoding from array backed buffer
Repository: storm
Updated Branches:
refs/heads/1.x-branch c5ea9e355 -> 07c68d5a6
[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/61bb5583
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/61bb5583
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/61bb5583
Branch: refs/heads/1.x-branch
Commit: 61bb558303dd5ead9e44645ca16c95a574ea1a0e
Parents: c5ea9e3
Author: Marcus Thiesen <mt...@hubrick.com>
Authored: Tue Apr 11 10:02:38 2017 +0200
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Apr 14 14:50:15 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/61bb5583/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);
}
[3/3] storm git commit: STORM-2467: CHANGELOG
Posted by ka...@apache.org.
STORM-2467: CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/07c68d5a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/07c68d5a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/07c68d5a
Branch: refs/heads/1.x-branch
Commit: 07c68d5a6e4c8dbf4bb198e7ffaed1021016684c
Parents: db082b8
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Apr 14 15:00:27 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Apr 14 15:00:27 2017 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/07c68d5a/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a13dae1..1327a9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
\ufeff## 1.1.1
+ * STORM-2467: Use explicit charset when decoding from array backed buffer
* STORM-1114: Race condition in trident zookeeper zk-node create/delete
* STORM-2429: Properly validate supervisor.scheduler.meta
* STORM-2194: Stop ignoring socket timeout error from executor
[2/3] storm git commit: Merge branch 'STORM-2467-1.x-merge' into
1.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2467-1.x-merge' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/db082b8f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/db082b8f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/db082b8f
Branch: refs/heads/1.x-branch
Commit: db082b8f0b1d3306939c7a3cf587358b8df20372
Parents: c5ea9e3 61bb558
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Apr 14 14:50:21 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Apr 14 14:50:21 2017 +0900
----------------------------------------------------------------------
.../storm-kafka/src/jvm/org/apache/storm/kafka/StringScheme.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------