From fe81f3943b9c5f91305a2084e8b47e924024c4d0 Mon Sep 17 00:00:00 2001
From: michaeloffner <michaeloffner@users.noreply.github.com>
Date: Tue, 10 Sep 2024 10:22:57 +0200
Subject: [PATCH] remove source for possible
 java.util.ConcurrentModificationException

---
 .../lucee/commons/io/log/log4j2/Log4j2Engine.java  | 14 ++++++++++----
 loader/build.xml                                   |  2 +-
 loader/pom.xml                                     |  2 +-
 3 files changed, 12 insertions(+), 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
index d1b26f3797..b5ffdcf8ba 100644
--- 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
index 28d0ee5dd3..c5c6373959 100644
--- 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
index f2156391f2..d278addfc0 100644
--- 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>