This is an automated email from the ASF dual-hosted git repository. amichai pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit e458161d0bd94f5f49db040843c7906b7c52ec8c Author: Amichai Rothman <[email protected]> AuthorDate: Wed May 29 09:25:18 2024 +0300 ARIES-2041 Fix ConcurrentModificationExceptions in TopologyManagerExport --- .../aries/rsa/topologymanager/exporter/TopologyManagerExport.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java index 66a81ce5..dac5238b 100644 --- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java +++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java @@ -21,11 +21,10 @@ package org.apache.aries.rsa.topologymanager.exporter; import java.util.ArrayList; 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.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; import org.apache.aries.rsa.spi.ExportPolicy; @@ -68,8 +67,8 @@ public class TopologyManagerExport implements ServiceListener { this.notifier = notifier; this.executor = executor; this.policy = policy; - this.endpointRepo = new HashMap<>(); - this.toBeExported = new HashSet<>(); + this.endpointRepo = new ConcurrentHashMap<>(); + this.toBeExported = Collections.newSetFromMap(new ConcurrentHashMap<>()); } private String getTypeName(ServiceEvent event) {
