From e64b1074a794f348df5d6149c4685001289c8e47 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Wed, 31 Mar 2021 22:15:00 +0300
Subject: [PATCH] queue consumer: added queue check on the very first poll in
 the lifecycle before any subscribe method calls

---
 .../server/queue/common/AbstractTbQueueConsumerTemplate.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java
index 43f7321120..4481e52461 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java
@@ -78,7 +78,7 @@ public abstract class AbstractTbQueueConsumerTemplate<R, T extends TbQueueMsg> i
         if (stopped) {
             return errorAndReturnEmpty();
         }
-        if (!subscribed && partitions == null) {
+        if (!subscribed && partitions == null && subscribeQueue.isEmpty()) {
             return sleepAndReturnEmpty(startNanos, durationInMillis);
         }