1 files changed, 5 insertions, 4 deletions
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StagingApprove.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StagingApprove.java
index 9cc6fe3bd8..c0830c27c7 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StagingApprove.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StagingApprove.java
@@ -218,6 +218,9 @@ public class StagingApprove extends BaseCommand {
       // Validate change status and destination branch.
       validateChanges();
 
+      // Use current message or read it from stdin.
+      prepareMessage();
+
       // If result is passed, check that the user has required access rights
       // to submit changes.
       if (passed) {
@@ -237,9 +240,6 @@ public class StagingApprove extends BaseCommand {
             merger, hooks);
       }
 
-      // Use current message or read it from stdin.
-      prepareMessage();
-
       // Iterate through each open change and publish message.
       for (PatchSet patchSet : toApprove) {
         final PatchSet.Id patchSetId = patchSet.getId();
@@ -345,7 +345,7 @@ public class StagingApprove extends BaseCommand {
       IOException, InvalidChangeOperationException {
     if (message != null && message.length() > 0) {
       publishCommentsFactory.create(patchSetId, message,
-          new HashSet<ApprovalCategoryValue.Id>()).call();
+          new HashSet<ApprovalCategoryValue.Id>(), false).call();
     }
   }
 
@@ -493,6 +493,7 @@ public class StagingApprove extends BaseCommand {
       final Change change = db.changes().get(changeId);
 
       final BuildApprovedSender sender = buildApprovedFactory.create(change);
+      sender.setBuildApprovedMessage(message);
       sender.setFrom(currentUser.getAccountId());
       sender.setPatchSet(patchSet);
       sender.send();