Repository: olingo-odata4 Updated Branches: refs/heads/master 4cae638ff -> 0a2ebd795
[OLINGO-1152] Fix IllegalArgumentException when enum property is null. 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/6b34920a Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/6b34920a Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/6b34920a Branch: refs/heads/master Commit: 6b34920a5b0e465875ceebddc8a85fec086b8160 Parents: 4cae638 Author: Tom van Wietmarschen <[email protected]> Authored: Thu Jul 20 16:49:26 2017 +0200 Committer: Christian Amend <[email protected]> Committed: Fri Sep 8 14:50:58 2017 +0200 ---------------------------------------------------------------------- .../olingo/client/core/serialization/JsonDeserializer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6b34920a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/JsonDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/JsonDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/JsonDeserializer.java index ec896bb..b2cfd49 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/JsonDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/JsonDeserializer.java @@ -385,7 +385,9 @@ public class JsonDeserializer implements ODataDeserializer { break; case ENUM: - valuable.setValue(ValueType.ENUM, node.asText()); + if(!node.isNull()) { + valuable.setValue(ValueType.ENUM, node.asText()); + } break; case PRIMITIVE:
