Move saving out of synchronized block

This commit is contained in:
AsamK 2021-12-26 12:40:06 +01:00
parent f7b2916618
commit 3b81ba3596

View file

@ -189,6 +189,7 @@ public class GroupStore {
} }
public void mergeRecipients(final RecipientId recipientId, final RecipientId toBeMergedRecipientId) { public void mergeRecipients(final RecipientId recipientId, final RecipientId toBeMergedRecipientId) {
Storage storage = null;
synchronized (groups) { synchronized (groups) {
var modified = false; var modified = false;
for (var group : this.groups.values()) { for (var group : this.groups.values()) {
@ -201,9 +202,12 @@ public class GroupStore {
} }
} }
if (modified) { if (modified) {
saver.save(toStorageLocked()); storage = toStorageLocked();
} }
} }
if (storage != null) {
saver.save(storage);
}
} }
private GroupInfo getGroupLocked(final GroupId groupId) { private GroupInfo getGroupLocked(final GroupId groupId) {