cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject git commit: Fixing a typo in HttpUtils
Date Fri, 25 Apr 2014 14:56:23 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes deae3617d -> 6c60b1631


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/6c60b163
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6c60b163
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6c60b163

Branch: refs/heads/2.7.x-fixes
Commit: 6c60b1631c16a337cf97e5d472759e1b2e3b2660
Parents: deae361
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Fri Apr 25 15:55:06 2014 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Fri Apr 25 15:56:00 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/6c60b163/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 01d8c39..710ce89 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
@@ -459,7 +459,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;
     }
 }


Mime
View raw message