summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Ostrovsky <david.ostrovsky@gmail.com>2017-03-06 19:18:06 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-03-06 19:18:07 +0000
commitc80a302fe8e748d2c870af5634fd0c22c52637c4 (patch)
tree4fe9ca619151035ef1bd3a6c920cb9c58331ab08
parent8eddd8975e7c7715e03c55290c8f60c4eb9845e3 (diff)
parentdedd974d4bc40824e70838b31a36cb543eea320d (diff)
Merge "Fix eviction order when linking new external ids" into stable-2.13
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java
index 7e403ad025..bbcfecc5ef 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java
@@ -406,8 +406,8 @@ public class AccountManager {
if (who.getEmailAddress() != null) {
byEmailCache.evict(who.getEmailAddress());
- byIdCache.evict(to);
}
+ byIdCache.evict(to);
}
return new AuthResult(to, key, false);