[mqtt][HA] ConcurrentHashMap to avoid ConcurrentModificationException (…

…openhab#8239) * [mqtt][homeassistant] Use ConcurrentHashMap to avoid ConcurrentModificationException Signed-off-by: Aitor Iturrioz <[email protected]>
andrewfg · Aug 31, 2020 · 6743e26 · 6743e26
1 parent f2155cc
commit 6743e26
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/...ava/org/openhab/binding/mqtt/homeassistant/internal/discovery/HomeAssistantDiscovery.java b/...ava/org/openhab/binding/mqtt/homeassistant/internal/discovery/HomeAssistantDiscovery.java
@@ -17,11 +17,11 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -65,7 +65,7 @@ public class HomeAssistantDiscovery extends AbstractMQTTDiscovery {
     private final Logger logger = LoggerFactory.getLogger(HomeAssistantDiscovery.class);
     protected final Map<String, Set<HaID>> componentsPerThingID = new TreeMap<>();
     protected final Map<String, ThingUID> thingIDPerTopic = new TreeMap<>();
-    protected final Map<String, DiscoveryResult> results = new TreeMap<>();
+    protected final Map<String, DiscoveryResult> results = new ConcurrentHashMap<>();
 
     private @Nullable ScheduledFuture<?> future;
     private final Gson gson;
@@ -165,7 +165,7 @@ public void receivedMessage(ThingUID connectionBridge, MqttBrokerConnection conn
         thingIDPerTopic.put(topic, thingUID);
 
         // We need to keep track of already found component topics for a specific thing
-        Set<HaID> components = componentsPerThingID.computeIfAbsent(thingID, key -> new HashSet<>());
+        Set<HaID> components = componentsPerThingID.computeIfAbsent(thingID, key -> ConcurrentHashMap.newKeySet());
         components.add(haID);
 
         final String componentNames = components.stream().map(id -> id.component)
@@ -178,23 +178,19 @@ public void receivedMessage(ThingUID connectionBridge, MqttBrokerConnection conn
         properties = handlerConfig.appendToProperties(properties);
         properties = config.appendToProperties(properties);
 
-        synchronized (results) {
-            // Because we need the new properties map with the updated "components" list
-            results.put(thingUID.getAsString(),
-                    DiscoveryResultBuilder.create(thingUID).withProperties(properties)
-                            .withRepresentationProperty("objectid").withBridge(connectionBridge)
-                            .withLabel(config.getThingName() + " (" + componentNames + ")").build());
-        }
+        // Because we need the new properties map with the updated "components" list
+        results.put(thingUID.getAsString(),
+                DiscoveryResultBuilder.create(thingUID).withProperties(properties).withRepresentationProperty(thingID)
+                        .withBridge(connectionBridge).withLabel(config.getThingName() + " (" + componentNames + ")")
+                        .build());
     }
 
     protected void publishResults() {
         Collection<DiscoveryResult> localResults;
 
-        synchronized (results) {
-            localResults = new ArrayList<>(results.values());
-            results.clear();
-            componentsPerThingID.clear();
-        }
+        localResults = new ArrayList<>(results.values());
+        results.clear();
+        componentsPerThingID.clear();
         for (DiscoveryResult result : localResults) {
             final ThingTypeUID typeID = result.getThingTypeUID();
             ThingType type = typeProvider.derive(typeID, MqttBindingConstants.HOMEASSISTANT_MQTT_THING).build();