From 32f0c3c67c3d319cbe609d79860970ba8f22034f Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Tue, 19 Mar 2024 13:30:20 +0200
Subject: [PATCH] Don't create Rule Engine consumer when no partitions to avoid
 NPE when deleting queue

---
 .../queue/DefaultTbRuleEngineConsumerService.java      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java
index 13de09bb2d..f0b93a175a 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java
@@ -114,9 +114,17 @@ public class DefaultTbRuleEngineConsumerService extends AbstractConsumerService<
             if (partitionService.isManagedByCurrentService(queueKey.getTenantId())) {
                 var consumer = getConsumer(queueKey).orElseGet(() -> {
                     Queue config = queueService.findQueueByTenantIdAndName(queueKey.getTenantId(), queueKey.getQueueName());
+                    if (config == null) {
+                        if (!partitions.isEmpty()) {
+                            log.error("[{}] Queue configuration is missing", queueKey, new RuntimeException("stacktrace"));
+                        }
+                        return null;
+                    }
                     return createConsumer(queueKey, config);
                 });
-                consumer.update(partitions);
+                if (consumer != null) {
+                    consumer.update(partitions);
+                }
             }
         });
         consumers.keySet().stream()