Commit 89644e7de45df9a184c546654f110c2cae53e0d7

Authored by Volodymyr Babak
2 parents 99864776 dfd601e3

Merge branch 'master' of github.com:thingsboard/thingsboard into edge-fix-concurrent-async-issue

@@ -63,7 +63,7 @@ public class TbRpcService { @@ -63,7 +63,7 @@ public class TbRpcService {
63 63
64 private void pushRpcMsgToRuleEngine(TenantId tenantId, Rpc rpc) { 64 private void pushRpcMsgToRuleEngine(TenantId tenantId, Rpc rpc) {
65 TbMsg msg = TbMsg.newMsg("RPC_" + rpc.getStatus().name(), rpc.getDeviceId(), TbMsgMetaData.EMPTY, JacksonUtil.toString(rpc)); 65 TbMsg msg = TbMsg.newMsg("RPC_" + rpc.getStatus().name(), rpc.getDeviceId(), TbMsgMetaData.EMPTY, JacksonUtil.toString(rpc));
66 - tbClusterService.pushMsgToRuleEngine(tenantId, rpc.getId(), msg, null); 66 + tbClusterService.pushMsgToRuleEngine(tenantId, rpc.getDeviceId(), msg, null);
67 } 67 }
68 68
69 public Rpc findRpcById(TenantId tenantId, RpcId rpcId) { 69 public Rpc findRpcById(TenantId tenantId, RpcId rpcId) {