SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix possible concurrent modification error in EnvironmentController

Browse Source 
Fixes gh-180
This commit is contained in:
Dave Syer
2015-07-10 12:02:12 +01:00
parent ccc44db8eb
commit 7828a0ee5a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -297,9 +298,10 @@ public class EnvironmentController {
}
private void postProcessProperties(Map<String, Object> propertiesMap) {
for (String key : propertiesMap.keySet()) {
for (Iterator<String> iter = propertiesMap.keySet().iterator(); iter.hasNext(); ) {
String key = iter.next();
if (key.equals("spring.profiles")) {
propertiesMap.remove(key);
iter.remove();
}
}
}