[CAMEL-9960]create ReaderInputStream align encoding with Exchange
(cherry picked from commit 767a98b47aba44c7392dbb8b7f3c5f556e40682b)
(cherry picked from commit 0de81d1e029d30ca61446a7b8977c30c56f198a0)
(cherry picked from commit bb7fafabc4699389a10107611403bef48c81c8a7)
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index 514fa59..cde9d42 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -165,8 +165,9 @@
camelExchange.getOut().getHeaders().putAll(camelExchange.getIn().getHeaders());
// propagate body
+ String encoding = (String)camelExchange.getProperty(Exchange.CHARSET_NAME);
camelExchange.getOut().setBody(DefaultCxfBinding.getContentFromCxf(cxfMessage,
- camelExchange.getProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.class)));
+ camelExchange.getProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.class), encoding));
// propagate response context
if (responseContext != null && responseContext.size() > 0) {
@@ -277,8 +278,9 @@
setCharsetWithContentType(camelExchange);
// set body
+ String encoding = (String)camelExchange.getProperty(Exchange.CHARSET_NAME);
Object body = DefaultCxfBinding.getContentFromCxf(cxfMessage,
- camelExchange.getProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.class));
+ camelExchange.getProperty(CxfConstants.DATA_FORMAT_PROPERTY, DataFormat.class), encoding);
if (body != null) {
camelExchange.getIn().setBody(body);
}
@@ -703,7 +705,7 @@
}
}
- protected static Object getContentFromCxf(Message message, DataFormat dataFormat) {
+ protected static Object getContentFromCxf(Message message, DataFormat dataFormat, String encoding) {
Set<Class<?>> contentFormats = message.getContentFormats();
Object answer = null;
if (contentFormats != null) {
@@ -733,7 +735,11 @@
if (answer == null) {
answer = message.getContent(Reader.class);
if (answer != null) {
- answer = new ReaderInputStream((Reader)answer);
+ if (encoding == null) {
+ encoding = "UTF-8";
+ }
+ LOG.trace("file encoding is = {}", encoding);
+ answer = new ReaderInputStream((Reader)answer, Charset.forName(encoding));
}
}
