Repository: cxf Updated Branches: refs/heads/master ecd6ae912 -> ff1da204f
Fixing a typo in HttpUtils Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ff1da204 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ff1da204 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ff1da204 Branch: refs/heads/master Commit: ff1da204f47347bd4d5447b757db7fee4cf10fb5 Parents: ecd6ae9 Author: Sergey Beryozkin <sberyoz...@talend.com> Authored: Fri Apr 25 15:55:06 2014 +0100 Committer: Sergey Beryozkin <sberyoz...@talend.com> Committed: Fri Apr 25 15:55:06 2014 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ff1da204/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java index 4b572a6..ac4dbca 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java @@ -546,8 +546,8 @@ public final class HttpUtils { } public static String getEncoding(MediaType mt, String defaultEncoding) { - String charset = mt == null ? "UTF-8" : mt.getParameters().get("charset"); - return charset == null ? "UTF-8" : charset; + String charset = mt == null ? defaultEncoding : mt.getParameters().get("charset"); + return charset == null ? defaultEncoding : charset; } public static URI resolve(UriBuilder baseBuilder, URI uri) {