Updated Branches: refs/heads/camel-2.11.x 321543a54 -> 86fe48860 refs/heads/camel-2.12.x 3f1edb04f -> f9bbf60fe
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/f9bbf60f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f9bbf60f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f9bbf60f Branch: refs/heads/camel-2.12.x Commit: f9bbf60fed7c4029abdf32f4ee7b242014cdbe45 Parents: 3f1edb0 Author: Willem Jiang <ningji...@apache.org> Authored: Fri Oct 25 20:44:54 2013 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Fri Oct 25 21:06:34 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/f9bbf60f/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();
