From 3b65e3c23c0dc2a3192fa0c2cee3121fa5c79166 Mon Sep 17 00:00:00 2001
From: zbeacon <ibarkov.ua@gmail.com>
Date: Mon, 18 Jan 2021 13:50:00 +0200
Subject: [PATCH] Refactoring

---
 .../server/transport/mqtt/session/GatewayDeviceSessionCtx.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionCtx.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionCtx.java
index 1983c3f68d..db9ea66c44 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionCtx.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/GatewayDeviceSessionCtx.java
@@ -41,7 +41,7 @@ public class GatewayDeviceSessionCtx extends MqttDeviceAwareSessionContext imple
         this.parent = parent;
         JsonParser parser = new JsonParser();
         boolean activityTimeFromGatewayDevice = Boolean.FALSE;
-        if ("null".equals(this.parent.getDeviceInfo().getAdditionalInfo())) {
+        if (this.parent.getDeviceInfo().getAdditionalInfo() != null && !"null".equals(this.parent.getDeviceInfo().getAdditionalInfo())) {
             JsonObject additionalInfo = parser.parse(this.parent.getDeviceInfo().getAdditionalInfo()).getAsJsonObject();
             if (additionalInfo.get("activityTimeFromGatewayDevice") != null) {
                 activityTimeFromGatewayDevice = additionalInfo.get("activityTimeFromGatewayDevice").getAsBoolean();