Skip to content

fix(firestore, android): avoid ConcurrentModificationException by collecting Firestore instances before termination #17956

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

Merged
SelaseKay merged 1 commit into from
Jan 19, 2026
+5 −3
Merged

fix(firestore, android): avoid ConcurrentModificationException by collecting Firestore instances before termination #17956

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions ...d/src/main/java/io/flutter/plugins/firebase/firestore/FlutterFirebaseFirestorePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,15 +207,17 @@ public Task<Void> didReinitializeFirebaseCore() {
() -> {
try {
// Context is ignored by API so we don't send it over even though annotated non-null.
List<FirebaseFirestore> firestoresToTerminate;
synchronized (firestoreInstanceCache) {
for (Map.Entry<FirebaseFirestore, FlutterFirebaseFirestoreExtension> entry :
firestoreInstanceCache.entrySet()) {
FirebaseFirestore firestore = entry.getKey();
// Collect all firestore instances first to avoid ConcurrentModificationException
firestoresToTerminate = new ArrayList<>(firestoreInstanceCache.keySet());
for (FirebaseFirestore firestore : firestoresToTerminate) {
Tasks.await(firestore.terminate());
FlutterFirebaseFirestorePlugin.destroyCachedFirebaseFirestoreInstanceForKey(
firestore);
}
}

removeEventListeners();

taskCompletionSource.setResult(null);
Expand Down
Loading