From f38fc26dcbb0758815483488c2dfa94f3d0625ac Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@thingsboard.io>
Date: Sun, 6 Jun 2021 22:31:54 +0300
Subject: [PATCH] LWM2M: merge with master

---
 .../lwm2m/server/DefaultLwM2MTransportMsgHandler.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2MTransportMsgHandler.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2MTransportMsgHandler.java
index d82dbcbf08..10f2dfeff5 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2MTransportMsgHandler.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2MTransportMsgHandler.java
@@ -461,7 +461,7 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
         log.warn("4) toDeviceRpcRequestMsg: [{}], sessionUUID: [{}]", toDeviceRpcRequestMsg, requestUUID);
         String bodyParams = StringUtils.trimToNull(toDeviceRpcRequestMsg.getParams()) != null ? toDeviceRpcRequestMsg.getParams() : "null";
         LwM2mTypeOper lwM2mTypeOper = setValidTypeOper(toDeviceRpcRequestMsg.getMethodName());
-        if (!this.rpcSubscriptions.containsKey(requestUUID)) {
+//        if (!this.rpcSubscriptions.containsKey(requestUUID)) {
             this.rpcSubscriptions.put(requestUUID, toDeviceRpcRequestMsg.getExpirationTime());
             LwM2mClientRpcRequest lwm2mClientRpcRequest = null;
             try {
@@ -486,7 +486,7 @@ public class DefaultLwM2MTransportMsgHandler implements LwM2mTransportMsgHandler
                 }
                 this.onToDeviceRpcResponse(lwm2mClientRpcRequest.getDeviceRpcResponseResultMsg(), sessionInfo);
             }
-        }
+//        }
     }
 
     private void checkRpcRequestTimeout() {