From 7828a0ee5a2f4a3430b012343a6d77be77fbdd17 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Fri, 10 Jul 2015 12:02:12 +0100
Subject: [PATCH] Fix possible concurrent modification error in
 EnvironmentController

Fixes gh-180
---
 .../cloud/config/server/EnvironmentController.java          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java
index dd6774e7..b728d8a0 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java
@@ -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();
 			}
 		}
 	}