From cba1972109c173d1c29797b943ed48b9223bf40e Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Wed, 11 Jun 2025 14:43:22 +0300
Subject: [PATCH] fixed null pointer exception

---
 .../service/sync/ie/importing/impl/ResourceImportService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/ResourceImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/ResourceImportService.java
index 96fcdd5425..37639f6a90 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/ResourceImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/ResourceImportService.java
@@ -66,7 +66,7 @@ public class ResourceImportService extends BaseEntityImportService<TbResourceId,
     protected void cleanupForComparison(TbResource resource) {
         super.cleanupForComparison(resource);
         resource.setSearchText(null);
-        if (resource.getDescriptor().isNull()) {
+        if (resource.getDescriptor() != null && resource.getDescriptor().isNull()) {
             resource.setDescriptor(null);
         }
     }