diff --git a/application/src/main/java/org/thingsboard/server/service/rule/DefaultTbRuleChainService.java b/application/src/main/java/org/thingsboard/server/service/rule/DefaultTbRuleChainService.java index 14f56d1f6b..e9795ce15f 100644 --- a/application/src/main/java/org/thingsboard/server/service/rule/DefaultTbRuleChainService.java +++ b/application/src/main/java/org/thingsboard/server/service/rule/DefaultTbRuleChainService.java @@ -36,6 +36,7 @@ import org.thingsboard.server.dao.relation.RelationService; import org.thingsboard.server.dao.rule.RuleChainService; import org.thingsboard.server.queue.util.TbCoreComponent; +import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; @@ -111,7 +112,7 @@ public class DefaultTbRuleChainService implements TbRuleChainService { Set ruleChainIds = new HashSet<>(); log.debug("[{}][{}] Going to update links in related rule chains", tenantId, ruleChainId); if (result.getUpdatedRuleNodes() == null || result.getUpdatedRuleNodes().isEmpty()) { - return null; + return Collections.emptyList(); } Set oldLabels = new HashSet<>();