From cefb144c169e23c984dc3f7b7a60b99d3325741c Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Tue, 19 Dec 2017 14:54:29 +0100 Subject: [PATCH] AccountManager#update: Update account and external IDs atomically Change-Id: I35be222e0265edfd73cd3c032cc5288f7a5344d0 Signed-off-by: Edwin Kempin --- .../com/google/gerrit/server/account/AccountManager.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/java/com/google/gerrit/server/account/AccountManager.java b/java/com/google/gerrit/server/account/AccountManager.java index 82dc5a05d2..2aff0e9214 100644 --- a/java/com/google/gerrit/server/account/AccountManager.java +++ b/java/com/google/gerrit/server/account/AccountManager.java @@ -216,10 +216,11 @@ public class AccountManager { accountUpdates.add(u -> u.setPreferredEmail(newEmail)); } - externalIdsUpdateFactory - .create() - .replace( - extId, ExternalId.create(extId.key(), extId.accountId(), newEmail, extId.password())); + accountUpdates.add( + u -> + u.replaceExternalId( + extId, + ExternalId.create(extId.key(), extId.accountId(), newEmail, extId.password()))); } if (!realm.allowsEdit(AccountFieldName.FULL_NAME)