100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Use ConcurrentHashMap for gateway asset id map (#3454)
cgrs5722cad8785672ec
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.javaindex 81ae740cc..421cff9e2 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java@@ -120,7 +120,7 @@ public class GatewayService extends RouteBuilder implements ContainerService {*/protected final Map<String, GatewayConnector> gatewayConnectorMap = new ConcurrentHashMap<>();- protected final Map<String, String> assetIdGatewayIdMap = new HashMap<>();+ protected final Map<String, String> assetIdGatewayIdMap = new ConcurrentHashMap<>();protected boolean active;protected List<String> realmIds = new ArrayList<>();protected Map<String, GatewayTunnelInfo> tunnelInfos = new ConcurrentHashMap<>();@@ -746,7 +746,8 @@ public class GatewayService extends RouteBuilder implements ContainerService {/** Check if the specified asset ID or parent ID is a known gateway or descendant of a gateway. */public String getLocallyRegisteredGatewayId(String assetId, String parentId) {- String gatewayId = assetIdGatewayIdMap.get(assetId);+ // ConcurrentHashMap rejects null keys so preserve HashMap behaviour of mapping to null+ String gatewayId = assetId != null ? assetIdGatewayIdMap.get(assetId) : null;if (gatewayId != null) {return gatewayId;@@ -924,16 +925,9 @@ public class GatewayService extends RouteBuilder implements ContainerService {// The asset would have been modified by the gateway connector so all we need to do here is// update the id mapswitch (persistenceEvent.getCause()) {- case CREATE, UPDATE -> {- synchronized (assetIdGatewayIdMap) {- assetIdGatewayIdMap.put(childAsset.getId(), gatewayId);- }- }- case DELETE -> {- synchronized (assetIdGatewayIdMap) {- assetIdGatewayIdMap.remove(childAsset.getId());- }- }+ // ConcurrentHashMap operations are individually thread safe so no synchronization needed+ case CREATE, UPDATE -> assetIdGatewayIdMap.put(childAsset.getId(), gatewayId);+ case DELETE -> assetIdGatewayIdMap.remove(childAsset.getId());}}