/**
 * Copyright © 2016-2022 The Thingsboard Authors
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.thingsboard.server.service.edge.rpc;

import com.google.common.util.concurrent.SettableFuture;
import lombok.Data;
import org.thingsboard.server.gen.edge.v1.DownlinkMsg;

import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ScheduledFuture;

@Data
public class EdgeSessionState {

    private final ConcurrentMap<Integer, DownlinkMsg> pendingMsgsMap = new ConcurrentHashMap<>();
    private SettableFuture<Void> sendDownlinkMsgsFuture;
    private ScheduledFuture<?> scheduledSendDownlinkTask;
}

@@ -808,37 +808,52 @@
 va.util.
-concurrent.Concurrent
+Collections;%0Aimport java.util.Linked
 HashMap;
@@ -874,29 +874,8 @@
 til.
-concurrent.Concurrent
 Map;
@@ -978,26 +978,16 @@
 e final 
-Concurrent
 Map%3CInte
@@ -1025,22 +1025,46 @@
 p = 
-new Concurrent
+Collections.synchronizedMap(new Linked
 Hash
@@ -1070,16 +1070,17 @@
 hMap%3C%3E()
+)
 ;%0A    pr

Revert LinkedHashMap