Commit 560b950a8faa522268a5a9e04ddac501dc626d47
Committed by
Andrew Shvayka
1 parent
b3f6938c
added null check for queueName
Showing
1 changed file
with
5 additions
and
0 deletions
... | ... | @@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; |
21 | 21 | import io.netty.channel.EventLoopGroup; |
22 | 22 | import lombok.extern.slf4j.Slf4j; |
23 | 23 | import org.springframework.data.redis.core.RedisTemplate; |
24 | +import org.springframework.util.StringUtils; | |
24 | 25 | import org.thingsboard.common.util.ListeningExecutor; |
25 | 26 | import org.thingsboard.rule.engine.api.MailService; |
26 | 27 | import org.thingsboard.rule.engine.api.RuleEngineRpcService; |
... | ... | @@ -43,6 +44,7 @@ import org.thingsboard.server.common.data.rule.RuleNode; |
43 | 44 | import org.thingsboard.server.common.msg.TbActorMsg; |
44 | 45 | import org.thingsboard.server.common.msg.TbMsg; |
45 | 46 | import org.thingsboard.server.common.msg.TbMsgMetaData; |
47 | +import org.thingsboard.server.common.msg.queue.ServiceQueue; | |
46 | 48 | import org.thingsboard.server.common.msg.queue.ServiceType; |
47 | 49 | import org.thingsboard.server.common.msg.queue.TopicPartitionInfo; |
48 | 50 | import org.thingsboard.server.dao.alarm.AlarmService; |
... | ... | @@ -178,6 +180,9 @@ class DefaultTbContext implements TbContext { |
178 | 180 | } |
179 | 181 | |
180 | 182 | private TopicPartitionInfo resolvePartition(TbMsg tbMsg, String queueName) { |
183 | + if (StringUtils.isEmpty(queueName)) { | |
184 | + queueName = ServiceQueue.MAIN; | |
185 | + } | |
181 | 186 | return mainCtx.resolve(ServiceType.TB_RULE_ENGINE, queueName, getTenantId(), tbMsg.getOriginator()); |
182 | 187 | } |
183 | 188 | ... | ... |