remove source for possible java.util.ConcurrentModificationException

lucee · Sep 10, 2024 · fe81f39 · fe81f39
1 parent 3f50a48
commit fe81f39
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/core/src/main/java/lucee/commons/io/log/log4j2/Log4j2Engine.java b/core/src/main/java/lucee/commons/io/log/log4j2/Log4j2Engine.java
@@ -641,12 +641,18 @@ private static Appender getFallback(Config config) {
 	}
 
 	private static void lowerCase(Map<String, String> map) {
-		String v;
+		List<String> changes = null;
 		for (String k: map.keySet()) {
 			if (hasUpperCase(k)) {
-				v = map.get(k);
-				map.put(k.toLowerCase(), v);
-				map.remove(k);
+				if (changes == null) changes = new ArrayList<>();
+				changes.add(k);
+			}
+		}
+		if (changes != null) {
+			synchronized (map) {
+				for (String k: changes) {
+					map.put(k.toLowerCase(), map.remove(k));
+				}
 			}
 		}
 	}

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.1.1.82-SNAPSHOT"/>
+  <property name="version" value="6.1.1.83-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.1.1.82-SNAPSHOT</version>
+  <version>6.1.1.83-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>