commit c89244818ea058f26d3552211662cb5c065c6655
author ekempin <ekempin@google.com> Mon Dec 05 10:33:12 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 05 10:33:12 2016 +0000
tree 41c92e9a07b9ff12a406ccd915e391595eb60007
parent ba057fb7490fea1cfae41603428b113156e14d6c
parent 96e0d7fd8be23db14520a26cffa93eafed53c3fa

Merge "Fix eviction order when linking new external ids"

gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java

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 8baef83..d0c6a84 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
@@ -396,8 +396,8 @@
 
         if (who.getEmailAddress() != null) {
           byEmailCache.evict(who.getEmailAddress());
-          byIdCache.evict(to);
         }
+        byIdCache.evict(to);
       }
 
       return new AuthResult(to, key, false);