From e81f1cf2aee824c90834204a889ee66a4446df7c Mon Sep 17 00:00:00 2001 From: Madan Jampani Date: Tue, 15 Sep 2015 11:00:41 -0700 Subject: [PATCH] Avoid concurrent modification exception by iterating over a immutable collection Change-Id: Icfffa1347071eb298a25b11ee0511f36002b0675 --- .../org/onosproject/store/consistent/impl/DatabaseManager.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java index b7c3794bad..fbc2c88d87 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java +++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java @@ -47,7 +47,6 @@ import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.ReferenceCardinality; import org.apache.felix.scr.annotations.ReferencePolicy; import org.apache.felix.scr.annotations.Service; - import org.onosproject.app.ApplicationEvent; import org.onosproject.app.ApplicationListener; import org.onosproject.app.ApplicationService; @@ -252,7 +251,7 @@ public class DatabaseManager implements StorageService, StorageAdminService { log.info("Successfully closed databases."); } }); - maps.values().forEach(this::unregisterMap); + ImmutableList.copyOf(maps.values()).forEach(this::unregisterMap); if (applicationService != null) { applicationService.removeListener(appListener); }