Lwm2m: back: fix review

@@ -236,7 +236,9 @@ public class LwM2MTransportRequest {
     private void sendRequest(LeshanServer lwServer, Registration registration, DownlinkRequest request, long timeoutInMs) {
     private void sendRequest(LeshanServer lwServer, Registration registration, DownlinkRequest request, long timeoutInMs) {
         LwM2MClient lwM2MClient = this.service.lwM2mInMemorySecurityStore.getLwM2MClientWithReg(registration, null);
         LwM2MClient lwM2MClient = this.service.lwM2mInMemorySecurityStore.getLwM2MClientWithReg(registration, null);
         lwServer.send(registration, request, timeoutInMs, (ResponseCallback<?>) response -> {
         lwServer.send(registration, request, timeoutInMs, (ResponseCallback<?>) response -> {
-            if (!lwM2MClient.isInit()) lwM2MClient.initValue(this.service, request.getPath().toString());
+            if (!lwM2MClient.isInit()) {
+                lwM2MClient.initValue(this.service, request.getPath().toString());
+            }
             if (isSuccess(((Response) response.getCoapResponse()).getCode())) {
             if (isSuccess(((Response) response.getCoapResponse()).getCode())) {
                 this.handleResponse(registration, request.getPath().toString(), response, request);
                 this.handleResponse(registration, request.getPath().toString(), response, request);
                 if (request instanceof WriteRequest && ((WriteRequest) request).isReplaceRequest()) {
                 if (request instanceof WriteRequest && ((WriteRequest) request).isReplaceRequest()) {
@@ -254,7 +256,9 @@ public class LwM2MTransportRequest {
                 log.error("[{}] - [{}] [{}] error SendRequest", ((Response) response.getCoapResponse()).getCode(), response.getCode(), request.getPath().toString());
                 log.error("[{}] - [{}] [{}] error SendRequest", ((Response) response.getCoapResponse()).getCode(), response.getCode(), request.getPath().toString());
             }
             }
         }, e -> {
         }, e -> {
-            if (!lwM2MClient.isInit()) lwM2MClient.initValue(this.service, request.getPath().toString());
+            if (!lwM2MClient.isInit()) {
+                lwM2MClient.initValue(this.service, request.getPath().toString());
+            }
             String msg = String.format(LOG_LW2M_ERROR + ": sendRequest: Resource path - %s msg error - %s  SendRequest to Client",
             String msg = String.format(LOG_LW2M_ERROR + ": sendRequest: Resource path - %s msg error - %s  SendRequest to Client",
                     request.getPath().toString(), e.toString());
                     request.getPath().toString(), e.toString());
             service.sentLogsToThingsboard(msg, registration);
             service.sentLogsToThingsboard(msg, registration);

@@ -28,10 +28,11 @@ import org.thingsboard.server.gen.transport.TransportProtos.ValidateDeviceCreden
 import org.thingsboard.server.transport.lwm2m.server.LwM2MTransportServiceImpl;
 import org.thingsboard.server.transport.lwm2m.server.LwM2MTransportServiceImpl;
 import org.thingsboard.server.transport.lwm2m.utils.LwM2mValueConverterImpl;
 import org.thingsboard.server.transport.lwm2m.utils.LwM2mValueConverterImpl;
 
 
-import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.UUID;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 
 @Slf4j
 @Slf4j
 @Data
 @Data
@@ -51,7 +52,7 @@ public class LwM2MClient implements Cloneable {
     private Map<String, String> attributes;
     private Map<String, String> attributes;
     private Map<String, ResourceValue> resources;
     private Map<String, ResourceValue> resources;
     private Map<String, TransportProtos.TsKvProto> delayedRequests;
     private Map<String, TransportProtos.TsKvProto> delayedRequests;
-    private ArrayList<String> pendingRequests;
+    private List<String> pendingRequests;
     private boolean init;
     private boolean init;
     private final LwM2mValueConverterImpl converter;
     private final LwM2mValueConverterImpl converter;
 
 
@@ -66,7 +67,7 @@ public class LwM2MClient implements Cloneable {
         this.credentialsResponse = credentialsResponse;
         this.credentialsResponse = credentialsResponse;
         this.attributes = new ConcurrentHashMap<>();
         this.attributes = new ConcurrentHashMap<>();
         this.delayedRequests = new ConcurrentHashMap<>();
         this.delayedRequests = new ConcurrentHashMap<>();
-        this.pendingRequests = new ArrayList<>();
+        this.pendingRequests = new CopyOnWriteArrayList<>();
         this.resources = new ConcurrentHashMap<>();
         this.resources = new ConcurrentHashMap<>();
         this.profileUuid = profileUuid;
         this.profileUuid = profileUuid;
         this.sessionUuid = sessionUuid;
         this.sessionUuid = sessionUuid;

@@ -165,12 +165,12 @@ public class LwM2mInMemorySecurityStore extends InMemorySecurityStore {
             if (this.sessions.get(registration.getEndpoint()) == null) {
             if (this.sessions.get(registration.getEndpoint()) == null) {
                 this.addLwM2MClientToSession(registration.getEndpoint());
                 this.addLwM2MClientToSession(registration.getEndpoint());
             }
             }
-            LwM2MClient lwM2MClient = this.sessions.get(registration.getEndpoint()).copy();
+            LwM2MClient lwM2MClient = this.sessions.get(registration.getEndpoint());
             lwM2MClient.setLwServer(lwServer);
             lwM2MClient.setLwServer(lwServer);
             lwM2MClient.setRegistration(registration);
             lwM2MClient.setRegistration(registration);
             lwM2MClient.setAttributes(registration.getAdditionalRegistrationAttributes());
             lwM2MClient.setAttributes(registration.getAdditionalRegistrationAttributes());
-            this.sessions.put(registration.getId(), lwM2MClient);
             this.sessions.remove(registration.getEndpoint());
             this.sessions.remove(registration.getEndpoint());
+            this.sessions.put(registration.getId(), lwM2MClient);
             return lwM2MClient;
             return lwM2MClient;
         } finally {
         } finally {
             writeLock.unlock();
             writeLock.unlock();
@@ -248,7 +248,8 @@ public class LwM2mInMemorySecurityStore extends InMemorySecurityStore {
         LwM2MClientProfile lwM2MClientProfile = LwM2MTransportHandler.getLwM2MClientProfileFromThingsboard(deviceProfile);
         LwM2MClientProfile lwM2MClientProfile = LwM2MTransportHandler.getLwM2MClientProfileFromThingsboard(deviceProfile);
         if (lwM2MClientProfile != null) {
         if (lwM2MClientProfile != null) {
             profiles.put(deviceProfile.getUuidId(), lwM2MClientProfile);
             profiles.put(deviceProfile.getUuidId(), lwM2MClientProfile);
+            return true;
         }
         }
-        return (lwM2MClientProfile != null);
+        return false;
     }
     }
 }
 }