Commit a045be771baef33e3791563006546aaf2b9d5710
Committed by
Andrew Shvayka
1 parent
0240476b
added null check for queueName
Showing
1 changed file
with
5 additions
and
0 deletions
... | ... | @@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; |
20 | 20 | import io.netty.channel.EventLoopGroup; |
21 | 21 | import lombok.extern.slf4j.Slf4j; |
22 | 22 | import org.springframework.data.redis.core.RedisTemplate; |
23 | +import org.springframework.util.StringUtils; | |
23 | 24 | import org.thingsboard.common.util.ListeningExecutor; |
24 | 25 | import org.thingsboard.rule.engine.api.MailService; |
25 | 26 | import org.thingsboard.rule.engine.api.RuleEngineAlarmService; |
... | ... | @@ -47,6 +48,7 @@ import org.thingsboard.server.common.data.rule.RuleNodeState; |
47 | 48 | import org.thingsboard.server.common.msg.TbActorMsg; |
48 | 49 | import org.thingsboard.server.common.msg.TbMsg; |
49 | 50 | import org.thingsboard.server.common.msg.TbMsgMetaData; |
51 | +import org.thingsboard.server.common.msg.queue.ServiceQueue; | |
50 | 52 | import org.thingsboard.server.common.msg.queue.ServiceType; |
51 | 53 | import org.thingsboard.server.common.msg.queue.TopicPartitionInfo; |
52 | 54 | import org.thingsboard.server.dao.asset.AssetService; |
... | ... | @@ -183,6 +185,9 @@ class DefaultTbContext implements TbContext { |
183 | 185 | } |
184 | 186 | |
185 | 187 | private TopicPartitionInfo resolvePartition(TbMsg tbMsg, String queueName) { |
188 | + if (StringUtils.isEmpty(queueName)) { | |
189 | + queueName = ServiceQueue.MAIN; | |
190 | + } | |
186 | 191 | return mainCtx.resolve(ServiceType.TB_RULE_ENGINE, queueName, getTenantId(), tbMsg.getOriginator()); |
187 | 192 | } |
188 | 193 | ... | ... |