Return-Path: <commits-return-42367-archive-asf-public=cust-asf.ponee.io@cxf.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id DA067200AE4
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri, 24 Jun 2016 13:26:13 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id D89F5160A5A; Fri, 24 Jun 2016 11:26:13 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 2CA00160A38
	for <archive-asf-public@cust-asf.ponee.io>; Fri, 24 Jun 2016 13:26:13 +0200 (CEST)
Received: (qmail 27139 invoked by uid 500); 24 Jun 2016 11:26:12 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 27130 invoked by uid 99); 24 Jun 2016 11:26:12 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jun 2016 11:26:12 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 3C804E049D; Fri, 24 Jun 2016 11:26:12 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: coheigea@apache.org
To: commits@cxf.apache.org
Message-Id: <806f3d196f4e403fbf1a3abe465205fe@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: cxf git commit: Fixing build
Date: Fri, 24 Jun 2016 11:26:12 +0000 (UTC)
archived-at: Fri, 24 Jun 2016 11:26:14 -0000

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 {