You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/08/08 15:48:41 UTC
camel git commit: camel-slack should use charset when sending to
slack. Thanks to lowwool for reporting. Fixes #589
Repository: camel
Updated Branches:
refs/heads/master 14d787681 -> b7bd574d0
camel-slack should use charset when sending to slack. Thanks to lowwool for reporting. Fixes #589
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b7bd574d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b7bd574d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b7bd574d
Branch: refs/heads/master
Commit: b7bd574d0b04d1b8ec990713ed7c7d84fd1c80c5
Parents: 14d7876
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Aug 8 15:56:16 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Aug 8 15:56:16 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/slack/SlackProducer.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b7bd574d/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackProducer.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackProducer.java
index 637f830..6572e01 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackProducer.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackProducer.java
@@ -23,6 +23,7 @@ import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
import org.apache.camel.component.slack.helper.SlackMessage;
import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.IOHelper;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
@@ -54,9 +55,12 @@ public class SlackProducer extends DefaultProducer {
slackMessage.setIconUrl(slackEndpoint.getIconUrl());
slackMessage.setIconEmoji(slackEndpoint.getIconEmoji());
+ // use charset from exchange or fallback to the default charset
+ String charset = IOHelper.getCharsetName(exchange, true);
+
// Set the post body
String json = asJson(slackMessage);
- StringEntity body = new StringEntity(json);
+ StringEntity body = new StringEntity(json, charset);
// Do the post
httpPost.setEntity(body);