Merge "Do not email reviewers adding themselves as reviewers"

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;