Avoid ConcurrentModificationException
Change-Id: I0cadfb3a49a67e3d21d6749c923af55d36589d5c
diff --git a/app/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java b/app/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
index 070a7ec..0282fa4 100644
--- a/app/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
+++ b/app/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
@@ -20,6 +20,7 @@
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Multimaps;
import com.google.common.collect.SetMultimap;
import org.onlab.packet.Ip4Address;
import org.onlab.packet.Ip6Address;
@@ -81,8 +82,8 @@
int pwRoutingLabel;
public SegmentRouterInfo() {
- gatewayIps = HashMultimap.create();
- subnets = HashMultimap.create();
+ gatewayIps = Multimaps.synchronizedSetMultimap(HashMultimap.create());
+ subnets = Multimaps.synchronizedSetMultimap(HashMultimap.create());
}
}