From cfc5fd9bc68d71899c29bbcd8ef4924908a4a079 Mon Sep 17 00:00:00 2001 From: Alexander Hain Date: Thu, 6 Mar 2025 21:35:14 +0100 Subject: [PATCH] GH-9878: Fix ConcurrentModificationEx for SpringIntegrationTestExecutionListener Fixes: #9878 Issue link: https://github.com/spring-projects/spring-integration/issues/9878 * `return Collections.unmodifiableList(this.autoStartupCandidates);` in the `MockIntegrationContext` Signed-off-by: Alexander Hain [artem.bilan@broadcom.com Improve commit message] Signed-off-by: Artem Bilan (cherry picked from commit 3d16e59f0b763498413c69f9920f4a529f525e54) --- .../integration/test/context/MockIntegrationContext.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 index 5d3a63183d..81e1a8a13e 100644 --- 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 @@ package org.springframework.integration.test.context; 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 @@ import org.springframework.util.ObjectUtils; * * @author Artem Bilan * @author Yicheng Feng + * @author Alexander Hain * * @since 5.0 * @@ -111,7 +113,7 @@ public class MockIntegrationContext implements BeanPostProcessor, SmartInitializ } List getAutoStartupCandidates() { - return this.autoStartupCandidates; + return Collections.unmodifiableList(this.autoStartupCandidates); } /**