diff options
author | Martin Fick <mogulguy@yahoo.com> | 2011-05-17 21:46:25 -0600 |
---|---|---|
committer | Martin Fick <mogulguy@yahoo.com> | 2011-05-17 21:46:35 -0600 |
commit | 2b18baeb0ef1dc40bc25c099204cb86945dbedc8 (patch) | |
tree | fa454a482e6178c2cf961221b2d68f62c16af5e8 | |
parent | 0908bff975f27dfca0f6d4afa0cc970835ee8ec6 (diff) |
Do not email reviewers adding themselves as reviewers
Normally an email is sent to a reviewer when they are added
as a reviewer on a change. In the special case that they
are the ones adding themselves as a reviwer, do not bother
sending them the notification email.
Change-Id: Id4c98325bd0e0c8cd141de5fd4fc57b13e258553
-rw-r--r-- | gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/AddReviewer.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/AddReviewer.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/AddReviewer.java index 9d508e2fcf..efe93f5d48 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/AddReviewer.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/AddReviewer.java @@ -132,11 +132,16 @@ class AddReviewer extends Handler<ReviewerResult> { // Email the reviewers // - final AddReviewerSender cm; - cm = addReviewerSenderFactory.create(control.getChange()); - cm.setFrom(currentUser.getAccountId()); - cm.addReviewers(added); - cm.send(); + // The user knows they added themselves, don't bother emailing them. + added.remove(currentUser.getAccountId()); + if (!added.isEmpty()) { + final AddReviewerSender cm; + + cm = addReviewerSenderFactory.create(control.getChange()); + cm.setFrom(currentUser.getAccountId()); + cm.addReviewers(added); + cm.send(); + } result.setChange(changeDetailFactory.create(changeId).call()); return result; |