GH-11042: Fix race condition in the ControlBusCommandRegistry#11046
Merged
Conversation
…egistry Fixes: spring-projects#11042 The `ControlBusCommandRegistry` can be accessed (and populated) concurrently. Therefore, it is better to protect its internal from the `ConcurrentModificationException` * Use `ConcurrentHashMap` and `synchronized` in the `ControlBusCommandRegistry` whenever concurrent access is possible. **Auto-cherry-pick to `7.0.x` & `6.5.x`**
cppwfs
requested changes
Jun 5, 2026
Contributor
cppwfs
left a comment
cppwfs
left a comment
There was a problem hiding this comment.
Good catch on using ConcurrentHashMap!
Have a question or two on the synchronization.
cppwfs
approved these changes
Jun 5, 2026
Contributor
cppwfs
left a comment
cppwfs
left a comment
There was a problem hiding this comment.
Thank you for the changes!
This looks great!
spring-builds
pushed a commit
that referenced
this pull request
Jun 5, 2026
* GH-11042: Fix race condition in the ControlBusCommandRegistry Fixes: #11042 The `ControlBusCommandRegistry` can be accessed (and populated) concurrently. Therefore, it is better to protect its internal from the `ConcurrentModificationException` * Use `ConcurrentHashMap` and `synchronized` in the `ControlBusCommandRegistry` whenever concurrent access is possible. * No need in `synchronized (this.controlBusCommands)` (cherry picked from commit f0a2f65)
spring-builds
pushed a commit
that referenced
this pull request
Jun 5, 2026
* GH-11042: Fix race condition in the ControlBusCommandRegistry Fixes: #11042 The `ControlBusCommandRegistry` can be accessed (and populated) concurrently. Therefore, it is better to protect its internal from the `ConcurrentModificationException` * Use `ConcurrentHashMap` and `synchronized` in the `ControlBusCommandRegistry` whenever concurrent access is possible. * No need in `synchronized (this.controlBusCommands)` (cherry picked from commit f0a2f65)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes: #11042
The
ControlBusCommandRegistrycan be accessed (and populated) concurrently. Therefore, it is better to protect its internal from theConcurrentModificationExceptionConcurrentHashMapandsynchronizedin theControlBusCommandRegistrywhenever concurrent access is possible.Auto-cherry-pick to
7.0.x&6.5.x