cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: Fixing build
Date Fri, 24 Jun 2016 11:26:12 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes be39b588a -> ad649c4c2


Fixing build


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

Branch: refs/heads/3.0.x-fixes
Commit: ad649c4c2e45da53dd4067ed6d399514fcafed5f
Parents: be39b58
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Jun 24 12:26:01 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Jun 24 12:26:01 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/ad649c4c/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 3e1d43b..a04ed3b 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, StandardCharsets.UTF_8.name());
+            String encoding = HttpUtils.getSetEncoding(m, headers, "UTF-8");
             if (InjectionUtils.isSupportedCollectionOrArray(cls)) {
                 marshalCollection(cls, obj, genericType, encoding, os, m, anns);
             } else {


Mime
View raw message