From ecc43baed2e2aa2efc69cb5f8a4549dc070a29fe Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Tue, 18 May 2021 13:49:38 +0300
Subject: [PATCH] startSyncProcess added tenant id and edge id

---
 .../server/service/edge/rpc/EdgeGrpcService.java          | 2 +-
 .../server/service/edge/rpc/EdgeGrpcSession.java          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
index 9cc93dd28f..e9c93d0396 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
@@ -200,7 +200,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
     public void startSyncProcess(TenantId tenantId, EdgeId edgeId) {
         EdgeGrpcSession session = sessions.get(edgeId);
         if (session != null && session.isConnected()) {
-            session.startSyncProcess();
+            session.startSyncProcess(tenantId, edgeId);
         } else {
             log.error("[{}] Edge is not connected [{}]", tenantId, edgeId);
             throw new RuntimeException("Edge is not connected");
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
index 68bb02fc00..01fa32795f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
@@ -188,7 +188,7 @@ public final class EdgeGrpcSession implements Closeable {
                 }
                 if (connected && requestMsg.getMsgType().equals(RequestMsgType.SYNC_REQUEST_RPC_MESSAGE)) {
                     if (requestMsg.getSyncRequestMsg().getSyncRequired()) {
-                        startSyncProcess();
+                        startSyncProcess(edge.getTenantId(), edge.getId());
                     }
                     syncCompleted = true;
                 }
@@ -229,12 +229,12 @@ public final class EdgeGrpcSession implements Closeable {
         };
     }
 
-    public void startSyncProcess() {
-        log.trace("[{}][{}] Staring edge sync process", edge.getTenantId(), edge.getId());
+    public void startSyncProcess(TenantId tenantId, EdgeId edgeId) {
+        log.trace("[{}][{}] Staring edge sync process", tenantId, edgeId);
         syncExecutorService.submit(() -> {
             try {
-                startProcessingEdgeEvents(new TenantWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService()));
                 startProcessingEdgeEvents(new SystemWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService()));
+                startProcessingEdgeEvents(new TenantWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService()));
                 startProcessingEdgeEvents(new DeviceProfilesEdgeEventFetcher(ctx.getDeviceProfileService()));
                 startProcessingEdgeEvents(new RuleChainsEdgeEventFetcher(ctx.getRuleChainService()));