Merge remote-tracking branch 'origin/corrections/qtqainfra-372' into integration/v2.2.1

Change-Id: I85591fa1a3c6cfc632f0ecfebd74bdbcac685795

1 files changed, 15 insertions, 8 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 8167d713bc..9cc6fe3bd8 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
@@ -310,15 +310,22 @@ public class StagingApprove extends BaseCommand {
         // TopicChangeControl.
         final TopicControl topicControl =
           topicControlFactory.validateFor(topicId);
-        List<ChangeSet> changeSets = db.changeSets().byTopic(topicId).toList();
-        for (ChangeSet changeSet : changeSets) {
-          CanSubmitResult result =
-            topicControl.canSubmit(db, changeSet.getId(), approvalTypes,
-                topicFunctionStateFactory);
-          if (result != CanSubmitResult.OK) {
-            throw new UnloggedFailure(1, result.getMessage());
-          }
+        Topic topic = db.topics().get(topicId);
+        // Only validate most current change set of topic
+        ChangeSet changeSet = db.changeSets().get(topic.currentChangeSetId());
+        CanSubmitResult result = topicControl.canSubmit(db, changeSet.getId(), approvalTypes, topicFunctionStateFactory);
+        if (result != CanSubmitResult.OK) {
+          throw new UnloggedFailure(1, result.getMessage());
         }
+//        List<ChangeSet> changeSets = db.changeSets().byTopic(topicId).toList();
+//        for (ChangeSet changeSet : changeSets) {
+//          CanSubmitResult result =
+//            topicControl.canSubmit(db, changeSet.getId(), approvalTypes,
+//                topicFunctionStateFactory);
+//          if (result != CanSubmitResult.OK) {
+//            throw new UnloggedFailure(1, result.getMessage());
+//          }
+//        }
       } else {
         // Change is not part of a topic. Validate it with ChangeControl.
         final ChangeControl changeControl =