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:35:46 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 62c0947ad -> ba8a86f40


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

Branch: refs/heads/3.0.x-fixes
Commit: ba8a86f40f89f413efec5f406d057682b20c5bfe
Parents: 62c0947
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:35:31 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/ba8a86f4/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 4c61df9..3e1d43b 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
@@ -310,7 +310,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