[CAMEL-13374] XMLTokenExpressionIterator Default Exchange charset overrides original xml encoding from InputStream

• Type: Bug
• Status: Resolved
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: 2.18.0, 2.22.0
• Fix Version/s: 3.10.0
• Component/s: camel-core
• Estimated Complexity: Unknown
• Assignee: Claus Ibsen
• Reporter: Sergey Smith
• Created: 27/Mar/19 17:04
• Updated: 23/Mar/21 09:00
• Resolved: 23/Mar/21 07:59

Description

Default Exchange charset overrides original xml encoding from InputStream

at

org.apache.camel.support.XMLTokenExpressionIterator.doEvaluate(Exchange exchange, boolean closeStream)

String charset = IOHelper.getCharsetName(exchange);

must be replaced with

String charset = IOHelper.getCharsetName(exchange, false);

then at 

// woodstox's getLocation().etCharOffset() does not return the offset correctly for InputStream, so use Reader instead.
this(path, nsmap, mode, group, new InputStreamReader(in, charset));

and 

// woodstox's getLocation().etCharOffset() does not return the offset correctly for InputStream, so use Reader instead.
this(path, nsmap, mode, 1, new InputStreamReader(in, charset));

lines use 

org.apache.commons.io.input.XmlStreamReader instead of just InputStreamReader

it correctly determinants encoding from xml header when it present.

 

Examle document at InputStream body:

<?xml version = "1.0" encoding= "ISO-8859-5" standalone="no" ?>

<xml/>

Current charset result: is UTF-8 (default from IOHelper.getCharsetName(exchange))

Expected result: ISO-8859-5

 

Issue Links

• is related to: CAMEL-11846 xtokenize and apply xslt to a string does not work with UTF-16BE