cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Using UTF-8 as a default charset in JAXBElementProvider
Date Thu, 23 Jun 2016 15:33:49 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes beae71f1d -> 62b1dcc07


Using UTF-8 as a default charset in JAXBElementProvider


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/62b1dcc0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/62b1dcc0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/62b1dcc0

Branch: refs/heads/3.1.x-fixes
Commit: 62b1dcc078722d9fa988e688aac2fbdf4745ac1d
Parents: beae71f
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Thu Jun 23 16:31:29 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Thu Jun 23 16:33:20 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/62b1dcc0/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
index 8f834b5..a2593cf 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
@@ -311,7 +311,7 @@ public class JAXBElementProvider<T> extends AbstractJAXBProvider<T>
 {
         MediaType m, MultivaluedMap<String, Object> headers, OutputStream os) 
         throws IOException {
         try {
-            String encoding = HttpUtils.getSetEncoding(m, headers, null);
+            String encoding = HttpUtils.getSetEncoding(m, headers, StandardCharsets.UTF_8.name());
             if (InjectionUtils.isSupportedCollectionOrArray(cls)) {
                 marshalCollection(cls, obj, genericType, encoding, os, m, anns);
             } else {


Mime
View raw message