Repository: cxf Updated Branches: refs/heads/2.6.x-fixes c672aa020 -> 99949c2fa
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/e1c2196a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e1c2196a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e1c2196a Branch: refs/heads/2.6.x-fixes Commit: e1c2196a9f32b80449d814d8be8cd0f8ff59b52e Parents: c672aa0 Author: Sergey Beryozkin <[email protected]> Authored: Fri Apr 25 15:55:06 2014 +0100 Committer: Daniel Kulp <[email protected]> Committed: Mon May 5 15:56:08 2014 -0400 ---------------------------------------------------------------------- .../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/e1c2196a/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 4c884e5..98b89c9 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 @@ -390,7 +390,7 @@ 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; } }
