commit 78ed211c57744e5611e17d971515a16e3a80e006
author pier <pier@opennetworking.org> Mon Dec 03 11:25:23 2018 -0800
committer Pier Luigi Ventre <pier@opennetworking.org> Tue Dec 11 07:11:07 2018 +0000
tree 135f1c04e18cd3614c5a56facfaa5aae28d7c788
parent 6c48dba766f0e79a65098b94bc87f5f4d29dc3ff

Fix ConcurrentModificationException when processing PendingRemoveNextObjectives

Change-Id: Iaffad21812c86e26f0c9d44e39bc7e301c841bfe
(cherry picked from commit a761173fcba8f03b08c823af989adf987abee7c2)

drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OfdpaGroupHandlerUtility.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OfdpaGroupHandlerUtility.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OfdpaGroupHandlerUtility.java
index 5e48ebf..b962153 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OfdpaGroupHandlerUtility.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/OfdpaGroupHandlerUtility.java
@@ -705,13 +705,9 @@
                 keys.forEach(key -> groupHandler.processPendingUpdateNextObjs(key));
 
                 Set<GroupKey> k = Sets.newHashSet();
-                groupHandler.pendingRemoveNextObjectives
-                    .asMap().values().stream().forEach(keylist -> {
-                        k.addAll(keylist.stream()
-                                 .filter(key -> groupHandler.groupService
-                                         .getGroup(groupHandler.deviceId, key) == null)
-                                 .collect(Collectors.toSet()));
-                    });
+                groupHandler.pendingRemoveNextObjectives.asMap().values().forEach(keylist -> keylist.stream()
+                        .filter(key -> groupHandler.groupService.getGroup(groupHandler.deviceId, key) == null)
+                        .forEach(k::add));
                 k.forEach(key -> groupHandler.processPendingRemoveNextObjs(key));
 
             } catch (Exception exception) {