MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Expand `try`-`finally` scope of deleted accounts reconciliation lock

This commit is contained in:
Chris Eager 2023-02-27 21:07:05 -06:00 committed by Chris Eager
parent d0ccae129a
commit db198237f3
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/org/whispersystems/textsecuregcm/storage/DeletedAccountsManager.java
View File

@ -156,6 +156,7 @@ public class DeletedAccountsManager {
public void lockAndReconcileAccounts(final int max, final DeletedAccountReconciliationConsumer consumer) throws ChunkProcessingFailedException { public void lockAndReconcileAccounts(final int max, final DeletedAccountReconciliationConsumer consumer) throws ChunkProcessingFailedException {
final List<LockItem> lockItems = new ArrayList<>(); final List<LockItem> lockItems = new ArrayList<>();
try {
final List<Pair<UUID, String>> reconciliationCandidates = deletedAccounts.listAccountsToReconcile(max).stream() final List<Pair<UUID, String>> reconciliationCandidates = deletedAccounts.listAccountsToReconcile(max).stream()
.filter(pair -> { .filter(pair -> {
boolean lockAcquired = false; boolean lockAcquired = false;
@ -188,7 +189,6 @@ public class DeletedAccountsManager {
.filter(candidate -> numbersNeedingReconciliationAfterLock.contains(candidate.second())) .filter(candidate -> numbersNeedingReconciliationAfterLock.contains(candidate.second()))
.collect(Collectors.toList()); .collect(Collectors.toList());
try {
deletedAccounts.markReconciled(consumer.reconcile(accountsToReconcile)); deletedAccounts.markReconciled(consumer.reconcile(accountsToReconcile));
} finally { } finally {
lockItems.forEach( lockItems.forEach(