Revert "GetEmails: Create new IdentifiedUser"
This reverts commit c19481f1b380a6b7cefaed297a1c5f9c53abe65c.
This was likely a wrong fix. It was assumed that there is an
issue with IdentifiedUser being reused in some cases, but it
turned out that this was happening only during test
execution (see Ibcfb2b).
Change-Id: I753775708d72bb337c72a203e662d531d231dab3
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetEmails.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetEmails.java
index 99e6bd8..14cc74e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetEmails.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetEmails.java
@@ -15,8 +15,6 @@
package com.google.gerrit.server.account;
import com.google.gerrit.extensions.restapi.RestReadView;
-import com.google.gerrit.server.IdentifiedUser;
-import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.ArrayList;
@@ -26,20 +24,11 @@
@Singleton
public class GetEmails implements RestReadView<AccountResource> {
- private final IdentifiedUser.GenericFactory identifiedUserFactory;
-
- @Inject
- GetEmails(IdentifiedUser.GenericFactory identifiedUserFactory) {
- this.identifiedUserFactory = identifiedUserFactory;
- }
@Override
public List<EmailInfo> apply(AccountResource rsrc) {
- IdentifiedUser user =
- identifiedUserFactory.create(rsrc.getUser().getAccountId());
-
List<EmailInfo> emails = new ArrayList<>();
- for (String email : user.getEmailAddresses()) {
+ for (String email : rsrc.getUser().getEmailAddresses()) {
if (email != null) {
EmailInfo e = new EmailInfo();
e.email = email;
