Repository: olingo-odata4 Updated Branches: refs/heads/master 3e9e69314 -> 51f7af4b9
[OLINGO-989] Additional charset handling 1 Signed-off-by: Christian Amend <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/f46c680c Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/f46c680c Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/f46c680c Branch: refs/heads/master Commit: f46c680c9b07efa46165651e7a60407d5ad1b939 Parents: 3e9e693 Author: Kanika Jashrapuria <[email protected]> Authored: Thu Apr 28 14:30:12 2016 +0530 Committer: Christian Amend <[email protected]> Committed: Wed Jul 27 15:02:20 2016 +0200 ---------------------------------------------------------------------- .../client/core/communication/request/AbstractODataRequest.java | 2 +- .../request/batch/AbstractODataBatchRequestItem.java | 4 ++-- .../core/communication/request/batch/ODataChangesetImpl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f46c680c/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataRequest.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataRequest.java index 017006b..0528c66 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataRequest.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataRequest.java @@ -235,7 +235,7 @@ public abstract class AbstractODataRequest extends AbstractRequest implements OD final String value = getHeader(name); if (StringUtils.isNotBlank(value)) { - baos.write((name + ": " + value).getBytes()); + baos.write((name + ": " + value).getBytes(DEFAULT_CHARSET)); baos.write(ODataStreamer.CRLF); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f46c680c/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequestItem.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequestItem.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequestItem.java index 0a4cddf..70a4f90 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequestItem.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequestItem.java @@ -87,7 +87,7 @@ public abstract class AbstractODataBatchRequestItem extends AbstractODataStreame // stream batch content type stream(ODataBatchConstants.ITEM_CONTENT_TYPE_LINE.getBytes(DEFAULT_CHARSET)); newLine(); - stream(ODataBatchConstants.ITEM_TRANSFER_ENCODING_LINE.getBytes()); + stream(ODataBatchConstants.ITEM_TRANSFER_ENCODING_LINE.getBytes(DEFAULT_CHARSET)); newLine(); stream((ODataBatchConstants.CHANGESET_CONTENT_ID_NAME + ":" + contentId).getBytes()); newLine(); @@ -103,7 +103,7 @@ public abstract class AbstractODataBatchRequestItem extends AbstractODataStreame // stream batch content type stream(ODataBatchConstants.ITEM_CONTENT_TYPE_LINE.getBytes(DEFAULT_CHARSET)); newLine(); - stream(ODataBatchConstants.ITEM_TRANSFER_ENCODING_LINE.getBytes()); + stream(ODataBatchConstants.ITEM_TRANSFER_ENCODING_LINE.getBytes(DEFAULT_CHARSET)); newLine(); newLine(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f46c680c/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetImpl.java index e97c01c..c730c92 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetImpl.java @@ -116,7 +116,7 @@ public class ODataChangesetImpl extends AbstractODataBatchRequestItem newLine(); // stream batch-boundary - stream(("--" + boundary).getBytes()); + stream(("--" + boundary).getBytes(DEFAULT_CHARSET)); newLine(); // stream the request
