Prevent ConcurrentModificationException in TempTableThread shutdown (#7463)

labkey-tchad · web-flow · commit d2090d7cf2b2 · 2026-03-02T11:44:19.000-08:00
diff --git a/api/src/org/labkey/api/data/TempTableTracker.java b/api/src/org/labkey/api/data/TempTableTracker.java
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.lang.ref.Cleaner;
+import java.util.ArrayList;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -286,7 +287,8 @@ public void shutdownStarted()
         {
             synchronized(createdTableNames)
             {
-                for (TempTableTracker ttt : createdTableNames.values())
+                // Copy createdTableNames.values() to prevent ConcurrentModificationException
+                for (TempTableTracker ttt : new ArrayList<>(createdTableNames.values()))
                 {
                     ttt.state.run();
                 }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`import java.io.IOException;`
`27`	`27`	`import java.io.RandomAccessFile;`
`28`	`28`	`import java.lang.ref.Cleaner;`
	`29`	`+import java.util.ArrayList;`
`29`	`30`	`import java.util.Map;`
`30`	`31`	`import java.util.TreeMap;`
`31`	`32`	`import java.util.TreeSet;`
`@@ -286,7 +287,8 @@ public void shutdownStarted()`
`286`	`287`	`{`
`287`	`288`	`synchronized(createdTableNames)`
`288`	`289`	`{`
`289`		`- for (TempTableTracker ttt : createdTableNames.values())`
	`290`	`+ // Copy createdTableNames.values() to prevent ConcurrentModificationException`
	`291`	`+ for (TempTableTracker ttt : new ArrayList<>(createdTableNames.values()))`
`290`	`292`	`{`
`291`	`293`	`ttt.state.run();`
`292`	`294`	`}`