diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2019-03-14 09:01:59 +0900 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@collab.net> | 2019-03-14 09:08:30 +0900 |
| commit | 7a519876e5eaec14a86d091962a767054530709e (patch) | |
| tree | fe099a465a92f6ae30156703d13cfa9c564c454f /java/com/google/gerrit/server/account/AccountManager.java | |
| parent | fed5a852ffc4e21df6673715ac8febb52dd578d8 (diff) | |
| parent | 70c569da872934815f43cb16db8286d14b6b2dfa (diff) | |
Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Upgrade google-java-format to 1.7
Change-Id: Ia7383822ef59fb60bb5559956a065ae46b2e4f4a
Diffstat (limited to 'java/com/google/gerrit/server/account/AccountManager.java')
| -rw-r--r-- | java/com/google/gerrit/server/account/AccountManager.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/java/com/google/gerrit/server/account/AccountManager.java b/java/com/google/gerrit/server/account/AccountManager.java index 36b4b79f42..27945d1f07 100644 --- a/java/com/google/gerrit/server/account/AccountManager.java +++ b/java/com/google/gerrit/server/account/AccountManager.java @@ -456,8 +456,7 @@ public class AccountManager { } if (filteredExtIdsByScheme.size() > 1 - || !filteredExtIdsByScheme - .stream() + || !filteredExtIdsByScheme.stream() .anyMatch(e -> e.key().equals(who.getExternalIdKey()))) { u.deleteExternalIds(filteredExtIdsByScheme); } @@ -514,8 +513,7 @@ public class AccountManager { (a, u) -> { u.deleteExternalIds(extIds); if (a.getAccount().getPreferredEmail() != null - && extIds - .stream() + && extIds.stream() .anyMatch(e -> a.getAccount().getPreferredEmail().equals(e.email()))) { u.setPreferredEmail(null); } |