From eb2ebf58d91e06961b51ef4ad281fdff1e7a9026 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Sat, 23 May 2020 20:49:13 +0300
Subject: [PATCH] Fixed comp issue

---
 .../rpc/constructor/UserUpdateMsgConstructor.java |  2 +-
 .../edge/rpc/init/DefaultInitEdgeService.java     |  2 +-
 .../thingsboard/server/common/data/EdgeUtils.java | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/UserUpdateMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/UserUpdateMsgConstructor.java
index 8ec8b7c9ea..c227e840a9 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/UserUpdateMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/UserUpdateMsgConstructor.java
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultInitEdgeService.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultInitEdgeService.java
index 13afc300cd..848b67be84 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultInitEdgeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultInitEdgeService.java
@@ -230,7 +230,7 @@ public class DefaultInitEdgeService implements InitEdgeService {
                     for (RuleChain ruleChain : pageData.getData()) {
                         RuleChainUpdateMsg ruleChainUpdateMsg =
                                 ruleChainUpdateMsgConstructor.constructRuleChainUpdatedMsg(
-                                        edge,
+                                        edge.getRootRuleChainId(),
                                         UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE,
                                         ruleChain);
                         EntityUpdateMsg entityUpdateMsg = EntityUpdateMsg.newBuilder()
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EdgeUtils.java b/common/data/src/main/java/org/thingsboard/server/common/data/EdgeUtils.java
index 10008bc1a6..31449a7801 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EdgeUtils.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EdgeUtils.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.thingsboard.server.common.data;
 
 import org.thingsboard.server.common.data.id.EdgeId;