diff options
Diffstat (limited to 'gerrit-server/src/main/java/com/google/gerrit/server/mail/send/MergedSender.java')
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/mail/send/MergedSender.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/MergedSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/MergedSender.java index 47115afd3d..425ac655cd 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/MergedSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/MergedSender.java @@ -41,7 +41,7 @@ public class MergedSender extends ReplyToChangeSender { public MergedSender(EmailArguments ea, @Assisted Project.NameKey project, @Assisted Change.Id id) throws OrmException { super(ea, "merged", newChangeData(ea, project, id)); - labelTypes = changeData.changeControl().getLabelTypes(); + labelTypes = changeData.getLabelTypes(); } @Override @@ -70,7 +70,12 @@ public class MergedSender extends ReplyToChangeSender { Table<Account.Id, String, PatchSetApproval> neg = HashBasedTable.create(); for (PatchSetApproval ca : args.approvalsUtil.byPatchSet( - args.db.get(), changeData.changeControl(), patchSet.getId())) { + args.db.get(), + changeData.notes(), + args.identifiedUserFactory.create(changeData.change().getOwner()), + patchSet.getId(), + null, + null)) { LabelType lt = labelTypes.byLabel(ca.getLabelId()); if (lt == null) { continue; |