From c1648d5917fc752364898aab040d3280f2c9a2f4 Mon Sep 17 00:00:00 2001
From: Robbie Gemmell <robbie@apache.org>
Date: Tue, 29 Aug 2023 10:07:32 +0100
Subject: [PATCH] ARTEMIS-4406: update LocalCache persisted entry tracking to
 use a ConcurrentHashMap

---
 .../artemis/core/server/routing/caches/LocalCache.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/routing/caches/LocalCache.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/routing/caches/LocalCache.java
index a9542253a3..1ecfaa36fb 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/routing/caches/LocalCache.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/routing/caches/LocalCache.java
@@ -27,6 +27,7 @@ import java.lang.invoke.MethodHandles;
 
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
 public class LocalCache implements Cache, RemovalListener<String, String> {
@@ -70,7 +71,7 @@ public class LocalCache implements Cache, RemovalListener<String, String> {
    @Override
    public void start() {
       if (persisted) {
-         persistedCacheEntries = storageManager.getPersistedKeyValuePairs(id);
+         persistedCacheEntries = new ConcurrentHashMap<>(storageManager.getPersistedKeyValuePairs(id));
 
          if (persistedCacheEntries != null) {
             for (Map.Entry<String, PersistedKeyValuePair> cacheEntry : persistedCacheEntries.entrySet()) {