You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2015/01/22 12:39:16 UTC
olingo-odata4 git commit: Correct choice of JSON variant in client
Repository: olingo-odata4
Updated Branches:
refs/heads/master ce76e2ddd -> 6c894d7b6
Correct choice of JSON variant in client
Change-Id: I63922b7719c18930a7d640dca17e404a5939c445
Signed-off-by: Christian Amend <ch...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/6c894d7b
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/6c894d7b
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/6c894d7b
Branch: refs/heads/master
Commit: 6c894d7b661fb8d5bc45f5efe928de91008342dd
Parents: ce76e2d
Author: Klaus Straubinger <kl...@sap.com>
Authored: Thu Jan 22 12:29:15 2015 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Thu Jan 22 12:31:40 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/olingo/client/core/v4/ODataClientImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6c894d7b/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java
index 51c43f9..d88a63b 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java
@@ -110,8 +110,9 @@ public class ODataClientImpl extends AbstractODataClient<UpdateType> implements
@Override
public ODataSerializer getSerializer(final ODataFormat format) {
- return format == ODataFormat.ATOM || format == ODataFormat.XML
- ? new AtomSerializer(getServiceVersion()) : new JsonSerializer(getServiceVersion(), false);
+ return format == ODataFormat.ATOM || format == ODataFormat.XML ?
+ new AtomSerializer(getServiceVersion()) :
+ new JsonSerializer(getServiceVersion(), false, format);
}
@Override