Merged correction into integration

Merged 'origin/corrections/qtqainfra-389' into integration/v2.2.1

Change-Id: I78b3bd9af2c68adc4bb2acc6f764e2da3025470a

2 files changed, 6 insertions, 4 deletions

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
index 65c1e88146..f1e2b08454 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
@@ -683,7 +683,12 @@ public class ChangeUtil {
     final Change.Id changeId = patchSetId.getParentKey();
     AtomicUpdate<Change> atomicUpdate =
       getUpdateToState(Change.Status.INTEGRATING, Change.Status.MERGED);
-    db.changes().atomicUpdate(changeId, atomicUpdate);
+    Change change = db.changes().atomicUpdate(changeId, atomicUpdate);
+    List<PatchSetApproval> approvals = db.patchSetApprovals().byChange(changeId).toList();
+    for (PatchSetApproval a : approvals) {
+      a.cache(change);
+    }
+    db.patchSetApprovals().update(approvals);
   }
 
   /**
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 e3d984601b..8167d713bc 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
@@ -232,9 +232,6 @@ public class StagingApprove extends BaseCommand {
           throw e;
         }
 
-        for (PatchSet patch : toApprove) {
-          ChangeUtil.submit(patch.getId(), currentUser, db, opFactory, merger);
-        }
         // Rebuild staging branch.
         ChangeUtil.rebuildStaging(destination, currentUser, db, git, opFactory,
             merger, hooks);