Merge "Fail review command for changing labels when change is closed"

gerrit-server/src/main/java/com/google/gerrit/server/patch/PublishComments.java

@@ -30,6 +30,7 @@ import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.mail.CommentSender;
 import com.google.gerrit.server.mail.EmailException;
 import com.google.gerrit.server.project.ChangeControl;
+import com.google.gerrit.server.project.InvalidChangeOperationException;
 import com.google.gerrit.server.project.NoSuchChangeException;
 import com.google.gerrit.server.workflow.FunctionState;
 import com.google.gwtjsonrpc.client.VoidResult;
@@ -104,7 +105,8 @@ public class PublishComments implements Callable<VoidResult> {
   }
 
   @Override
-  public VoidResult call() throws NoSuchChangeException, OrmException {
+  public VoidResult call() throws NoSuchChangeException,
+      InvalidChangeOperationException, OrmException {
     final Change.Id changeId = patchSetId.getParentKey();
     final ChangeControl ctl = changeControlFactory.validateFor(changeId);
     change = ctl.getChange();
@@ -119,6 +121,8 @@ public class PublishComments implements Callable<VoidResult> {
     final boolean isCurrent = patchSetId.equals(change.currentPatchSetId());
     if (isCurrent && change.getStatus().isOpen()) {
       publishApprovals();
+    } else if (! approvals.isEmpty()) {
+      throw new InvalidChangeOperationException("Change is closed");
     } else {
       publishMessageOnly();
     }

gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java

@@ -222,9 +222,9 @@ public class ReviewCommand extends BaseCommand {
       }
     }
 
+    try {
       publishCommentsFactory.create(patchSetId, changeComment, aps).call();
 
-    try {
       if (abandonChange) {
         if (changeControl.canAbandon()) {
           ChangeUtil.abandon(patchSetId, currentUser, changeComment, db,