Skip to content

fix(sqs): prevent ConcurrentModificationException on container stop #1632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Baqirrizvidev wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(sqs): prevent ConcurrentModificationException on container stop #1632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e3a408
style: modernize stream collection in ConfigurationChangeDetector
Baqirrizvidev May 28, 2026
533226e
fix(sqs): prevent ConcurrentModificationException on container stop
Baqirrizvidev May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .../main/java/io/awspring/cloud/autoconfigure/config/reload/ConfigurationChangeDetector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.EnumerablePropertySource;
Expand Down Expand Up @@ -94,7 +93,7 @@ protected List<T> locateMapPropertySources(ConfigurableEnvironment environment)

return environment.getPropertySources().stream()
.filter(it -> (it.getClass().isAssignableFrom(propertySourceClass))).map(it -> (T) it)
.collect(Collectors.toList());
.toList();
}

public Class<T> getPropertySourceClass() {
Expand Down
2 changes: 1 addition & 1 deletion ...sqs/src/main/java/io/awspring/cloud/sqs/listener/source/AbstractPollingMessageSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ public void stop() {
if (!waitExistingTasksToFinish()) {
logger.warn("Tasks did not finish in {} seconds for queue {}, proceeding with shutdown",
this.shutdownTimeout.getSeconds(), this.pollingEndpointName);
this.pollingFutures.forEach(pollingFuture -> pollingFuture.cancel(true));
new ArrayList<>(this.pollingFutures).forEach(pollingFuture -> pollingFuture.cancel(true));
}
doStop();
this.acknowledgmentProcessor.stop();
Expand Down