fix: synchronize cache maps in SpringLookupInitializer (#17668)

To avoid possibility to get ConcurrentModificationException.
vaadin · Sep 21, 2023 · c2b41f1 · c2b41f1
1 parent 06bacb3
commit c2b41f1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/SpringLookupInitializer.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/SpringLookupInitializer.java
@@ -20,6 +20,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.BiFunction;
@@ -71,8 +72,9 @@ private SpringLookup(WebApplicationContext context,
                 Map<Class<?>, Collection<Class<?>>> services) {
             super(services, factory);
             this.context = context;
-            this.cachedServices = new HashMap<>();
-            this.cacheableServices = new HashMap<>();
+            this.cachedServices = Collections.synchronizedMap(new HashMap<>());
+            this.cacheableServices = Collections
+                    .synchronizedMap(new HashMap<>());
         }
 
         private <T> boolean isCacheableService(Class<T> serviceClass) {