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 <[email protected]> Authored: Thu Apr 30 11:10:11 2015 +0100 Committer: Sergey Beryozkin <[email protected]> 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;
