From dfd601e3676f941ead022d399e46edb3decaf87c Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Fri, 23 Jul 2021 15:02:29 +0300
Subject: [PATCH] Persistent RPCs are sent to a correct rule chain and queue

---
 .../java/org/thingsboard/server/service/rpc/TbRpcService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/rpc/TbRpcService.java b/application/src/main/java/org/thingsboard/server/service/rpc/TbRpcService.java
index e0343485db..456ea7d6d6 100644
--- a/application/src/main/java/org/thingsboard/server/service/rpc/TbRpcService.java
+++ b/application/src/main/java/org/thingsboard/server/service/rpc/TbRpcService.java
@@ -63,7 +63,7 @@ public class TbRpcService {
 
     private void pushRpcMsgToRuleEngine(TenantId tenantId, Rpc rpc) {
         TbMsg msg = TbMsg.newMsg("RPC_" + rpc.getStatus().name(), rpc.getDeviceId(), TbMsgMetaData.EMPTY, JacksonUtil.toString(rpc));
-        tbClusterService.pushMsgToRuleEngine(tenantId, rpc.getId(), msg, null);
+        tbClusterService.pushMsgToRuleEngine(tenantId, rpc.getDeviceId(), msg, null);
     }
 
     public Rpc findRpcById(TenantId tenantId, RpcId rpcId) {