From 6b99fb917a2fd5ec177c5f2258ba461711a39a04 Mon Sep 17 00:00:00 2001
From: imbeacon <ibarkov.ua@gmail.com>
Date: Thu, 12 Sep 2024 12:52:30 +0300
Subject: [PATCH] Fix for NPE

---
 .../org/thingsboard/server/dao/device/DeviceServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
index 55696c9e4b..d58249fef2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
@@ -557,7 +557,7 @@ public class DeviceServiceImpl extends CachedVersionedEntityService<DeviceCacheK
         device.setType(profile.getName());
         device.setTenantId(profile.getTenantId());
         ObjectNode additionalInfoNode = JacksonUtil.newObjectNode();
-        if (provisionRequest.getGateway()) {
+        if (provisionRequest.getGateway() != null && provisionRequest.getGateway()) {
             additionalInfoNode.put(DataConstants.GATEWAY_PARAMETER, true);
         }
         device.setAdditionalInfo(additionalInfoNode);