Browse Source

Visit only for SYSTEM rule chains

pull/2818/head
Volodymyr Babak 6 years ago
parent
commit
2f85f7037a
  1. 3
      application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java
  2. 4
      application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java

3
application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java

@ -24,6 +24,7 @@ import org.thingsboard.server.actors.ruleChain.RuleChainActor;
import org.thingsboard.server.actors.shared.EntityActorsManager;
import org.thingsboard.server.common.data.id.RuleChainId;
import org.thingsboard.server.common.data.rule.RuleChain;
import org.thingsboard.server.common.data.rule.RuleChainType;
import org.thingsboard.server.dao.rule.RuleChainService;
/**
@ -50,7 +51,7 @@ public abstract class RuleChainManager extends EntityActorsManager<RuleChainId,
@Override
public void visit(RuleChain entity, ActorRef actorRef) {
if (entity != null && entity.isRoot()) {
if (entity != null && entity.isRoot() && entity.getType().equals(RuleChainType.SYSTEM)) {
rootChain = entity;
rootChainActor = actorRef;
}

4
application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java

@ -141,7 +141,9 @@ public class TenantActor extends RuleChainManagerActor {
if (msg.getEntityId().getEntityType() == EntityType.RULE_CHAIN) {
RuleChain ruleChain = systemContext.getRuleChainService().
findRuleChainById(tenantId, new RuleChainId(msg.getEntityId().getId()));
ruleChainManager.visit(ruleChain, target);
if (ruleChain.getType().equals(RuleChainType.SYSTEM)) {
ruleChainManager.visit(ruleChain, target);
}
}
target.tell(msg, ActorRef.noSender());
} else {

Loading…
Cancel
Save