From e782872b5bc9f4f59e57445ff8a3ca7f0c90e66a Mon Sep 17 00:00:00 2001
From: chenlinghy <chenlinghy@cmhi.chinamobile.com>
Date: Thu, 21 Jan 2021 17:09:56 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=E8=A7=A3=E5=86=B3java.util.Conc?=
 =?UTF-8?q?urrentModificationException:=20null=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ability/impl/DpTechBypassAbilityImpl.java | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/dispose/ability/impl/DpTechBypassAbilityImpl.java b/src/main/java/com/dispose/ability/impl/DpTechBypassAbilityImpl.java
index 28d5a712..878ded18 100644
--- a/src/main/java/com/dispose/ability/impl/DpTechBypassAbilityImpl.java
+++ b/src/main/java/com/dispose/ability/impl/DpTechBypassAbilityImpl.java
@@ -562,22 +562,47 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl {
         });
 
         // UMC 同步到处置平台
-        dpBypassManager.getProtectObject().values().forEach(v -> {
-            String serviceId = v.getProtectName()
+        ArrayList<String> protectNames = new ArrayList<>();
+
+        for (DpProtectObject value : dpBypassManager.getProtectObject().values()) {
+            protectNames.add(value.getProtectName());
+
+        }
+
+        for (String protectName : protectNames) {
+            String serviceId = protectName
                     .replace(objectPrefix + "_", "")
                     .replace("_" + IpAddrType.IPV4.getDescription(), "")
                     .replace("_" + IpAddrType.IPV6.getDescription(), "");
 
             // UMC上面存在对象已经失效
             if (disposeServiceGroup.values().stream().noneMatch(k -> serviceId.equals(k.getServiceId()))) {
-                log.debug("++++Remove UMC Unused Protect Object: {}", v.getProtectName());
-                ErrorCode err = removeProtectObject(v.getProtectName());
+                log.info("++++Remove UMC Unused Protect Object: {}", protectName);
+                ErrorCode err = removeProtectObject(protectName);
 
                 if (err != ErrorCode.ERR_OK) {
-                    log.error("!!!!Remove Protect Object Error: {}", v.getProtectName());
+                    log.error("!!!!Remove Protect Object Error: {}", protectName);
                 }
             }
-        });
+
+        }
+
+//        dpBypassManager.getProtectObject().values().forEach(v -> {
+//            String serviceId = v.getProtectName()
+//                    .replace(objectPrefix + "_", "")
+//                    .replace("_" + IpAddrType.IPV4.getDescription(), "")
+//                    .replace("_" + IpAddrType.IPV6.getDescription(), "");
+//
+//            // UMC上面存在对象已经失效
+//            if (disposeServiceGroup.values().stream().noneMatch(k -> serviceId.equals(k.getServiceId()))) {
+//                log.info("++++Remove UMC Unused Protect Object: {}", v.getProtectName());
+//                ErrorCode err = removeProtectObject(v.getProtectName());
+//
+//                if (err != ErrorCode.ERR_OK) {
+//                    log.error("!!!!Remove Protect Object Error: {}", v.getProtectName());
+//                }
+//            }
+//        });
     }
 
     /**