Skip to content

ARIES-2230 Fix Race condition in TopologyManagerImpor handling of end… #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amichair merged 1 commit into from
May 30, 2026
+8 −4
Merged

ARIES-2230 Fix Race condition in TopologyManagerImpor handling of end… #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions ...er/src/main/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
Expand Down Expand Up @@ -110,9 +111,12 @@ public void remove(RemoteServiceAdmin rsa) {
public void remoteAdminEvent(RemoteServiceAdminEvent event) {
ImportReference ref = event.getImportReference();
if (event.getType() == RemoteServiceAdminEvent.IMPORT_UNREGISTRATION && ref != null) {
importedServices.allValues().stream()
.filter(reg -> ref.equals(reg.getImportReference()))
.forEach(this::unimportRegistration);
synchronized (this) {
List<ImportRegistration> closing = importedServices.allValues().stream()
.filter(reg -> ref.equals(reg.getImportReference()))
.collect(Collectors.toList()); // make a copy to prevent CME
closing.forEach(this::unimportRegistration);
}
}
}

Expand All @@ -133,7 +137,7 @@ private void synchronizeImportsAsync(final String filter) {
*
* @param filter the filter whose endpoints are synchronized
*/
private void synchronizeImports(final String filter) {
private synchronized void synchronizeImports(final String filter) {
try {
// we have a set of all current imports, and a set of all possible imports (with overlap)
Set<ImportRegistration> imported = importedServices.get(filter);
Expand Down