Skip to content

[Android] Fix ConcurrentModificationException in InteropUIBlockListener #51631

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

Closed
wants to merge 8 commits into from
Closed

[Android] Fix ConcurrentModificationException in InteropUIBlockListener #51631

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
90c5fa6
[Android] Fix ConcurrentModificationException in InteropUIBlockListene
jkoutavas May 27, 2025
3d5094a
cleanup
jkoutavas May 27, 2025
529dc5c
Avoid possible clear() raise condition
jkoutavas May 27, 2025
b2ad8e8
further cleanup
jkoutavas May 27, 2025
95feba8
All we ever needed was @Synchronized
jkoutavas May 28, 2025
e6f6d39
Revert "All we ever needed was @Synchronized"
jkoutavas May 28, 2025
6fb8ac4
The copying of beforeUiblocks and clearing of it still needs to happe…
jkoutavas May 28, 2025
75f2b75
prefer toList() over ArrayList()
jkoutavas May 29, 2025
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
32 changes: 20 additions & 12 deletions ...ndroid/src/main/java/com/facebook/react/fabric/internal/interop/InteropUiBlockListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,27 +39,35 @@ internal class InteropUIBlockListener : UIManagerListener {
}

override fun willMountItems(uiManager: UIManager) {
if (beforeUIBlocks.isEmpty()) {
return
val blocksToExecute: List<UIBlock> = synchronized(this) {
if (beforeUIBlocks.isEmpty()) {
return
}
beforeUIBlocks.toList().also { beforeUIBlocks.clear() }
}
beforeUIBlocks.forEach {
if (uiManager is UIBlockViewResolver) {
it.execute(uiManager)

if (uiManager is UIBlockViewResolver) {
// avoid ConcurrentModificationException by iterating over a copy
blocksToExecute.forEach { block ->
block.execute(uiManager)
}
}
beforeUIBlocks.clear()
}

override fun didMountItems(uiManager: UIManager) {
if (afterUIBlocks.isEmpty()) {
return
val blocksToExecute: List<UIBlock> = synchronized(this) {
if (afterUIBlocks.isEmpty()) {
return
}
afterUIBlocks.toList().also { afterUIBlocks.clear() }
}
afterUIBlocks.forEach {
if (uiManager is UIBlockViewResolver) {
it.execute(uiManager)

if (uiManager is UIBlockViewResolver) {
// avoid ConcurrentModificationException by iterating over a copy
blocksToExecute.forEach { block ->
block.execute(uiManager)
}
}
afterUIBlocks.clear()
}

override fun didDispatchMountItems(uiManager: UIManager) = didMountItems(uiManager)
Expand Down
Loading