From 42a451fcf3fa3ceba5845dd7c8352cfde56296e5 Mon Sep 17 00:00:00 2001 From: steve Date: Wed, 13 Jun 2018 16:08:24 +1200 Subject: [PATCH] Fixed ugly null pointer exception when there is no or incomplete root rule chain. Make it go to an log entry instead. --- .../org/thingsboard/server/actors/tenant/TenantActor.java | 4 ++++ 1 file changed, 4 insertions(+) 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 7a3127dd36..dc48e881cd 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 @@ -109,11 +109,15 @@ public class TenantActor extends RuleChainManagerActor { } private void onServiceToRuleEngineMsg(ServiceToRuleEngineMsg msg) { + if (ruleChainManager.getRootChainActor()!=null) ruleChainManager.getRootChainActor().tell(msg, self()); + else logger.info("[{}] No Root Chain", msg); } private void onDeviceActorToRuleEngineMsg(DeviceActorToRuleEngineMsg msg) { + if (ruleChainManager.getRootChainActor()!=null) ruleChainManager.getRootChainActor().tell(msg, self()); + else logger.info("[{}] No Root Chain", msg); } private void onRuleChainMsg(RuleChainToRuleChainMsg msg) {