From 2f85f7037aeea8562979ee591bdb032642ef8402 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Mon, 27 Apr 2020 12:56:58 +0300
Subject: [PATCH] Visit only for SYSTEM rule chains

---
 .../server/actors/shared/rulechain/RuleChainManager.java      | 3 ++-
 .../org/thingsboard/server/actors/tenant/TenantActor.java     | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java b/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java
index ef2b4282d4..aa47cc1769 100644
--- a/application/src/main/java/org/thingsboard/server/actors/shared/rulechain/RuleChainManager.java
+++ b/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;
         }
diff --git a/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java b/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java
index ae34e2b6c2..2626c6df5b 100644
--- a/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java
+++ b/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 {