From 21bc216b92564a871439a403cc131cefd0bc9418 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Tue, 25 Feb 2025 18:44:43 +0200
Subject: [PATCH] fixed potential NPE

---
 .../server/dao/attributes/BaseAttributesService.java          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java b/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java
index 7f53829faf..777a77d054 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/attributes/BaseAttributesService.java
@@ -132,7 +132,9 @@ public class BaseAttributesService implements AttributesService {
             for (TbPair<String, Long> keyVersionPair : result) {
                 String key = keyVersionPair.getFirst();
                 Long version = keyVersionPair.getSecond();
-                edqsService.onDelete(tenantId, ObjectType.ATTRIBUTE_KV, new AttributeKv(entityId, scope, key, version));
+                if (version != null) {
+                    edqsService.onDelete(tenantId, ObjectType.ATTRIBUTE_KV, new AttributeKv(entityId, scope, key, version));
+                }
                 keys.add(key);
             }
             return keys;