You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/10/25 15:05:11 UTC
git commit: CAMEL-6895 Supported to set the camel-xmljson Encoding
Updated Branches:
refs/heads/master e92aab5af -> 3e49c6979
CAMEL-6895 Supported to set the camel-xmljson Encoding
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3e49c697
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3e49c697
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3e49c697
Branch: refs/heads/master
Commit: 3e49c69790a05e0a3cf8785386bddddbeb0c962a
Parents: e92aab5
Author: Willem Jiang <ni...@apache.org>
Authored: Fri Oct 25 20:44:54 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Fri Oct 25 21:04:57 2013 +0800
----------------------------------------------------------------------
.../camel/dataformat/xmljson/XmlJsonDataFormat.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3e49c697/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormat.java b/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormat.java
index f68c60b..99a91d7 100644
--- a/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormat.java
+++ b/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormat.java
@@ -151,8 +151,17 @@ public class XmlJsonDataFormat extends ServiceSupport implements DataFormat {
} else {
json = serializer.read((String) xml);
}
-
- OutputStreamWriter osw = new OutputStreamWriter(stream, IOHelper.getCharsetName(exchange));
+ // don't return the default setting here
+ String encoding = IOHelper.getCharsetName(exchange, false);
+ if (encoding == null) {
+ encoding = getEncoding();
+ }
+ OutputStreamWriter osw = null;
+ if (encoding != null) {
+ osw = new OutputStreamWriter(stream, encoding);
+ } else {
+ osw = new OutputStreamWriter(stream);
+ }
json.write(osw);
osw.flush();