Skip to content

Guard mutex unlock in isLocked check to avoid errors during local data uploads #17472

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
merged 1 commit into from
Nov 17, 2022
Merged

Guard mutex unlock in isLocked check to avoid errors during local data uploads #17472

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: 7 additions & 1 deletion WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadStarter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,13 @@ class UploadStarter @Inject constructor(
)
}
} finally {
mutex.unlock()
// If the job of the current coroutine is cancelled while the `lock()` call is suspended,
// it results in the mutex ending up unlocked.
// We introduced this check to prevent IllegalStateExceptions when `unlock` is called in those cases.
// See: https://github.com/wordpress-mobile/WordPress-Android/issues/17463
if (mutex.isLocked) {
mutex.unlock()
}
}
}

Expand Down