From f2f8ef043ba7d0e23cd73a57b47e55cd86187792 Mon Sep 17 00:00:00 2001
From: Charles Chan <rascov@gmail.com>
Date: Mon, 18 Jun 2018 14:42:17 -0700
Subject: [PATCH] Fix ConcurrentModificationException

Change-Id: Ie4c3a56312156ded1cbc2fd8a0e4da822ff57205
---
 .../segmentrouting/config/DeviceConfiguration.java         | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
index 626109a7cb..704db9ad4e 100644
--- a/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
+++ b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
@@ -463,9 +463,12 @@ public class DeviceConfiguration implements DeviceProperties {
      */
     public Set<IpPrefix> getSubnets(DeviceId deviceId) {
         SegmentRouterInfo srinfo = deviceConfigMap.get(deviceId);
-        if (srinfo != null) {
+        if (srinfo != null && srinfo.subnets != null) {
+            // Note: ImmutableSet.Builder.addAll calls the iterator of parameter internally,
+            //       which is not protected by SynchronizedCollection mutex.
             ImmutableSet.Builder<IpPrefix> builder = ImmutableSet.builder();
-            return builder.addAll(srinfo.subnets.values()).build();
+            srinfo.subnets.forEach((k, v) -> builder.add(v));
+            return builder.build();
         }
         return null;
     }