GH-9878: Fix ConcurrentModificationException in SpringIntegrationTestExecutionListener

clf-ahain · clf-ahain · commit 854076428a7c · 2025-03-06T21:14:52.000+01:00
Fixes: gh-9878 * return new list in MockIntegrationContext.getAutoStartupCandidates() Signed-off-by: Alexander Hain <Alexander.hain@cloudflight.io>
diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/context/MockIntegrationContext.java b/spring-integration-test/src/main/java/org/springframework/integration/test/context/MockIntegrationContext.java
@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import reactor.core.publisher.Mono;
@@ -59,6 +60,7 @@
  *
  * @author Artem Bilan
  * @author Yicheng Feng
+ * @author Alexander Hain
  *
  * @since 5.0
  *
@@ -111,7 +113,7 @@ public void afterSingletonsInstantiated() {
 	}
 
 	List<AbstractEndpoint> getAutoStartupCandidates() {
-		return this.autoStartupCandidates;
+		return Collections.unmodifiableList(this.autoStartupCandidates);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`import java.util.ArrayList;`
`20`	`20`	`import java.util.Arrays;`
`21`	`21`	`import java.util.Collection;`
	`22`	`+import java.util.Collections;`
`22`	`23`	`import java.util.List;`
`23`	`24`
`24`	`25`	`import reactor.core.publisher.Mono;`
`@@ -59,6 +60,7 @@`
`59`	`60`	`*`
`60`	`61`	`* @author Artem Bilan`
`61`	`62`	`* @author Yicheng Feng`
	`63`	`+ * @author Alexander Hain`
`62`	`64`	`*`
`63`	`65`	`* @since 5.0`
`64`	`66`	`*`
`@@ -111,7 +113,7 @@ public void afterSingletonsInstantiated() {`
`111`	`113`	`}`
`112`	`114`
`113`	`115`	`List<AbstractEndpoint> getAutoStartupCandidates() {`
`114`		`- return this.autoStartupCandidates;`
	`116`	`+ return Collections.unmodifiableList(this.autoStartupCandidates);`
`115`	`117`	`}`
`116`	`118`
`117`	`119`	`/**`