Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DFF021785C for ; Thu, 30 Apr 2015 10:11:22 +0000 (UTC) Received: (qmail 11779 invoked by uid 500); 30 Apr 2015 10:11:22 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 11719 invoked by uid 500); 30 Apr 2015 10:11:22 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 11710 invoked by uid 99); 30 Apr 2015 10:11:22 -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; Thu, 30 Apr 2015 10:11:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A5B4FE0061; Thu, 30 Apr 2015 10:11:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-6377] Keeping CT for empty bodies by default, optionally blocking it Date: Thu, 30 Apr 2015 10:11:21 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes fa6d04a44 -> 0410877a4 [CXF-6377] Keeping CT for empty bodies by default, optionally blocking it Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0410877a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0410877a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0410877a Branch: refs/heads/3.0.x-fixes Commit: 0410877a4d50038125e383dd4cf00089a947bed0 Parents: fa6d04a Author: Sergey Beryozkin Authored: Thu Apr 30 11:10:11 2015 +0100 Committer: Sergey Beryozkin Committed: Thu Apr 30 11:10:59 2015 +0100 ---------------------------------------------------------------------- .../apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/0410877a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java index 505f84a..73e8d96 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java @@ -174,8 +174,6 @@ public class JAXRSOutInterceptor extends AbstractOutDatabindingInterceptor { if (initialResponseContentType != null && !responseHeaders.containsKey(HttpHeaders.CONTENT_TYPE)) { responseHeaders.putSingle(HttpHeaders.CONTENT_TYPE, initialResponseContentType); } - } else { - message.remove(Message.CONTENT_TYPE); } message.put(Message.PROTOCOL_HEADERS, responseHeaders); @@ -196,8 +194,10 @@ public class JAXRSOutInterceptor extends AbstractOutDatabindingInterceptor { if (entity == null) { if (!headResponse) { responseHeaders.putSingle(HttpHeaders.CONTENT_LENGTH, "0"); - responseHeaders.remove(HttpHeaders.CONTENT_TYPE); - message.remove(Message.CONTENT_TYPE); + if (MessageUtils.getContextualBoolean(message, "remove.content.type.for.empty.response", false)) { + responseHeaders.remove(HttpHeaders.CONTENT_TYPE); + message.remove(Message.CONTENT_TYPE); + } } HttpUtils.convertHeaderValuesToString(responseHeaders, true); return;