From d748537492d97bab9b0c8242d1f3addec0a0f6b9 Mon Sep 17 00:00:00 2001
From: RenKaiGe-Office <RenKaiGe-Office@renkaige-office>
Date: Tue, 5 Jun 2018 16:02:51 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4id?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E5=85=B3=E7=B3=BB=E6=97=B6=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/listener/CompileGroupRegionRela.java  | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/nis/listener/CompileGroupRegionRela.java b/src/main/java/com/nis/listener/CompileGroupRegionRela.java
index d76e5af..47a0122 100644
--- a/src/main/java/com/nis/listener/CompileGroupRegionRela.java
+++ b/src/main/java/com/nis/listener/CompileGroupRegionRela.java
@@ -1,6 +1,7 @@
 package com.nis.listener;
 
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -35,7 +36,7 @@ public class CompileGroupRegionRela extends ContextLoaderListener {
 	@Override
 	public void contextInitialized(ServletContextEvent event) {
 		try {
-			for (int i = 0; i <Configurations.getIntProperty("maxRedisDBIndex", 6); i++) {
+			for (int i = 0; i < Configurations.getIntProperty("maxRedisDBIndex", 6); i++) {
 				RedisTemplate<String, String> redisTemplate = SpringContextHolder.getBean("redisTemplate" + i);
 				getAllId(redisTemplate, i);
 			}
@@ -66,18 +67,18 @@ public class CompileGroupRegionRela extends ContextLoaderListener {
 							}
 
 						} else {
-//							String[] split = value.split("\t");
-//							String regionIdStr = split[0];
-//							String groupIdStr = split[1];
-//							if (groupRegionIdMap.containsKey(Long.valueOf(groupIdStr))) {
-//								groupRegionIdMap.get(Long.valueOf(groupIdStr)).add(Long.valueOf(regionIdStr));
-//							} else {
-//								Set<Long> list = new HashSet<Long>();
-//								list.add(Long.valueOf(regionIdStr));
-//								groupRegionIdMap.put(Long.valueOf(groupIdStr), list);
-//							}
+							// String[] split = value.split("\t");
+							// String regionIdStr = split[0];
+							// String groupIdStr = split[1];
+							// if (groupRegionIdMap.containsKey(Long.valueOf(groupIdStr))) {
+							// groupRegionIdMap.get(Long.valueOf(groupIdStr)).add(Long.valueOf(regionIdStr));
+							// } else {
+							// Set<Long> list = new HashSet<Long>();
+							// list.add(Long.valueOf(regionIdStr));
+							// groupRegionIdMap.put(Long.valueOf(groupIdStr), list);
+							// }
 							String[] split = value.split("\t");
-							//String regionIdStr = split[0];
+							// String regionIdStr = split[0];
 							String groupIdStr = split[1];
 							if (groupRegionIdMap.containsKey(Long.valueOf(groupIdStr))) {
 								groupRegionIdMap.get(Long.valueOf(groupIdStr)).add(keys);
@@ -172,9 +173,9 @@ public class CompileGroupRegionRela extends ContextLoaderListener {
 			Set<Long> list = maatRelation.getCompileAndGroupMap().get(compileId);
 
 			if (list != null && list.size() > 0) {
-				for (Long groupId : list) {
-					// }
-					// for (Long groupId: list.size()) {
+				Iterator<Long> iterator = list.iterator();
+				while (iterator.hasNext()) {
+					Long groupId = iterator.next();
 					if (maatRelation.getGroupAndCompileMap().containsKey(groupId)) {
 						// && maatRelation.getGroupAndCompileMap().get(groupId).size() == 1
 						// && maatRelation.getGroupAndCompileMap().get(groupId).get(0).longValue() ==
@@ -192,7 +193,8 @@ public class CompileGroupRegionRela extends ContextLoaderListener {
 										// maatRelation.getCompileAndGroupMap().get(compileId)
 										// list.remove(maatRelation.getCompileAndGroupMap().get(compileId).indexOf(groupId));//
 										// 删除编译下面的组
-										list.remove(groupId);// 删除编译下面的组
+										// list.remove(groupId);// 删除编译下面的组
+										iterator.remove();// 删除编译下面的组
 									}
 								}
 							}
@@ -203,8 +205,8 @@ public class CompileGroupRegionRela extends ContextLoaderListener {
 							// maatRelation.getGroupAndCompileMap().get(groupId)
 							// .remove(maatRelation.getGroupAndCompileMap().get(groupId).indexOf(compileId));//
 							// 删除分组关系中的组和编译关系
-
-							list.remove(groupId);// 删除编译下面的这个组
+							// list.remove(groupId);// 删除编译下面的这个组
+							iterator.remove();// 删除编译下面的这个组
 							maatRelation.getGroupAndCompileMap().get(groupId).remove(compileId);
 						}
 					} else {