From d95c2b88b0337fd185fd1d07bd48626f42dcfcbf Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Mon, 2 Aug 2021 14:55:43 +0300
Subject: [PATCH] Added proper hanling of null values for provision device key

---
 .../edge/rpc/constructor/DeviceProfileMsgConstructor.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceProfileMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceProfileMsgConstructor.java
index ef95ef0299..697e2aaf22 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceProfileMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceProfileMsgConstructor.java
@@ -61,7 +61,9 @@ public class DeviceProfileMsgConstructor {
         if (deviceProfile.getProvisionType() != null) {
             builder.setProvisionType(getStringValue(deviceProfile.getProvisionType().name()));
         }
-        builder.setProvisionDeviceKey(getStringValue(deviceProfile.getProvisionDeviceKey()));
+        if (deviceProfile.getProvisionDeviceKey() != null) {
+            builder.setProvisionDeviceKey(getStringValue(deviceProfile.getProvisionDeviceKey()));
+        }
         if (deviceProfile.getImage() != null) {
             builder.setImage(getBytesValue(ByteString.copyFrom(deviceProfile.getImage().getBytes(StandardCharsets.UTF_8))));
         }