diff options
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java index f1eb2e0b86..e738c6fab9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java @@ -61,15 +61,18 @@ public class AccountResolver { return byId.get(Account.Id.parse(nameOrEmail)).getAccount(); } + if (nameOrEmail.matches(Account.USER_NAME_PATTERN)) { + Account who = findByUserName(nameOrEmail); + if (who != null) { + return who; + } + } + Account account = findByNameOrEmail(nameOrEmail); if (account != null) { return account; } - if (nameOrEmail.matches(Account.USER_NAME_PATTERN)) { - return findByUserName(nameOrEmail); - } - return null; } |