From 3ad552b735d094f9813e50475094bbba784dab6d Mon Sep 17 00:00:00 2001
From: Andrew Shvayka <ashvayka@thingsboard.io>
Date: Wed, 30 Oct 2019 18:43:07 +0200
Subject: [PATCH] Allow Nulls in JsonConverter for usability

---
 .../server/common/transport/adaptor/JsonConverter.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/adaptor/JsonConverter.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/adaptor/JsonConverter.java
index 24b1343491..af757c2c27 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/adaptor/JsonConverter.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/adaptor/JsonConverter.java
@@ -201,10 +201,10 @@ public class JsonConverter {
                             .setBoolV(value.getAsBoolean()).build());
                 } else if (value.isNumber()) {
                     result.add(buildNumericKeyValueProto(value, valueEntry.getKey()));
-                } else {
+                } else if (!value.isJsonNull()) {
                     throw new JsonSyntaxException(CAN_T_PARSE_VALUE + value);
                 }
-            } else {
+            } else if (!element.isJsonNull()) {
                 throw new JsonSyntaxException(CAN_T_PARSE_VALUE + element);
             }
         }