Skip to content

CAMEL-5771 IOHelper.getCharsetName() should lookup CHARSET_NAME in heade... #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
Sep 28, 2013
Merged

CAMEL-5771 IOHelper.getCharsetName() should lookup CHARSET_NAME in heade... #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion camel-core/src/main/java/org/apache/camel/util/IOHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,8 @@ public static String getCharsetName(Exchange exchange) {
}

/**
* Gets the charset name if set as property {@link Exchange#CHARSET_NAME}.
* Gets the charset name if set as property or header {@link Exchange#CHARSET_NAME}.
* Notice: The lookup from the property has priority over the header
*
* @param exchange the exchange
* @param useDefault should we fallback and use JVM default charset if no property existed?
Expand All @@ -426,6 +427,9 @@ public static String getCharsetName(Exchange exchange) {
public static String getCharsetName(Exchange exchange, boolean useDefault) {
if (exchange != null) {
String charsetName = exchange.getProperty(Exchange.CHARSET_NAME, String.class);
if (charsetName == null) {
charsetName = exchange.getIn().getHeader(Exchange.CHARSET_NAME, String.class);
}
if (charsetName != null) {
return IOHelper.normalizeCharset(charsetName);
}
Expand Down