Repository: camel Updated Branches: refs/heads/master 5a72ec72e -> 9090acfe4
CAMEL-11605: Invalid accept header Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9090acfe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9090acfe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9090acfe Branch: refs/heads/master Commit: 9090acfe4fb12ac9b8d3089b280f5e9abc46d6ee Parents: 5a72ec7 Author: Dmitry Volodin <dmvo...@gmail.com> Authored: Thu Jul 27 10:43:03 2017 +0300 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Thu Jul 27 11:40:23 2017 +0200 ---------------------------------------------------------------------- .../camel/component/olingo4/api/impl/Olingo4AppImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9090acfe/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java ---------------------------------------------------------------------- diff --git a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java index ecc825a..2b90be7 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java +++ b/components/camel-olingo4/camel-olingo4-api/src/main/java/org/apache/camel/component/olingo4/api/impl/Olingo4AppImpl.java @@ -572,7 +572,8 @@ public final class Olingo4AppImpl implements Olingo4App { batchRequestHeaderOutputStream.write(ODataStreamer.CRLF); final ContentType acceptType = getResourceContentType(uriInfo); final String acceptCharset = acceptType.getParameter(ContentType.PARAMETER_CHARSET); - writeHttpHeader(batchRequestHeaderOutputStream, HttpHeaders.ACCEPT, acceptType.getType().toLowerCase()); + writeHttpHeader(batchRequestHeaderOutputStream, HttpHeaders.ACCEPT, + contentType.getType().toLowerCase() + "/" + contentType.getSubtype().toLowerCase()); if (null != acceptCharset) { writeHttpHeader(batchRequestHeaderOutputStream, HttpHeaders.ACCEPT_CHARSET, acceptCharset.toLowerCase()); } @@ -597,7 +598,8 @@ public final class Olingo4AppImpl implements Olingo4App { writeHttpHeader(batchRequestHeaderOutputStream, HttpHeader.ODATA_VERSION, ODataServiceVersion.V40.toString()); final ContentType acceptType = getResourceContentType(uriInfo); final String acceptCharset = acceptType.getParameter(ContentType.PARAMETER_CHARSET); - writeHttpHeader(batchRequestHeaderOutputStream, HttpHeaders.ACCEPT, acceptType.getType().toLowerCase()); + writeHttpHeader(batchRequestHeaderOutputStream, HttpHeaders.ACCEPT, + contentType.getType().toLowerCase() + "/" + contentType.getSubtype().toLowerCase()); if (null != acceptCharset) { writeHttpHeader(batchRequestHeaderOutputStream, HttpHeaders.ACCEPT_CHARSET, acceptCharset.toLowerCase()); } @@ -821,7 +823,8 @@ public final class Olingo4AppImpl implements Olingo4App { // add accept header when its not a form or multipart if (!ContentType.APPLICATION_FORM_URLENCODED.equals(contentType) && !contentType.toContentTypeString().startsWith(MULTIPART_MIME_TYPE)) { // otherwise accept what is being sent - httpUriRequest.addHeader(HttpHeaders.ACCEPT, contentType.getType().toLowerCase()); + httpUriRequest.addHeader(HttpHeaders.ACCEPT, + contentType.getType().toLowerCase() + "/" + contentType.getSubtype().toLowerCase()); final String acceptCharset = contentType.getParameter(ContentType.PARAMETER_CHARSET); if (null != acceptCharset) { httpUriRequest.addHeader(HttpHeaders.ACCEPT_CHARSET, acceptCharset.toLowerCase());
