commit e81f1cf2aee824c90834204a889ee66a4446df7c
author Madan Jampani <madan@onlab.us> Tue Sep 15 11:00:41 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Sep 15 18:07:51 2015 +0000
tree a79e014d8062db96bf4c3cc076d30b30fd988ac0
parent b0d7058766cc1d67eff98c2e27ea15d92e40b774

Avoid concurrent modification exception by iterating over a immutable collection

Change-Id: Icfffa1347071eb298a25b11ee0511f36002b0675

core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java

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 b7c3794..fbc2c88 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.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 @@
                     log.info("Successfully closed databases.");
                 }
             });
-        maps.values().forEach(this::unregisterMap);
+        ImmutableList.copyOf(maps.values()).forEach(this::unregisterMap);
         if (applicationService != null) {
             applicationService.removeListener(appListener);
         }