opendev/gerrit
Code Issues Proposed changes

Merge "Fix errors in MergeOp when using CherryPick"

Browse Source
This commit is contained in:
Martin Fick
2012-01-10 13:13:47 -08:00
committed by gerrit code review
parent 7629dcbd62 3b1ef8e8fb
commit e8c2d61a0d
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
View File

@@ -800,8 +800,9 @@ public class MergeOp {
} }
PatchSetApproval submitAudit = null; PatchSetApproval submitAudit = null;
List<PatchSetApproval> approvalList = null;
try { try {
final List<PatchSetApproval> approvalList = approvalList =
schema.patchSetApprovals().byPatchSet(n.patchsetId).toList(); schema.patchSetApprovals().byPatchSet(n.patchsetId).toList();
Collections.sort(approvalList, new Comparator<PatchSetApproval>() { Collections.sort(approvalList, new Comparator<PatchSetApproval>() {
public int compare(final PatchSetApproval a, final PatchSetApproval b) { public int compare(final PatchSetApproval a, final PatchSetApproval b) {
@@ -915,10 +916,8 @@ public class MergeOp {
} }
}); });
for (PatchSetApproval a : schema.patchSetApprovals().byChange( if (approvalList != null) {
n.change.getId())) { for (PatchSetApproval a : approvalList) {
// ApprovalCategory.SUBMIT is still in db but not relevant in git-store
if (!ApprovalCategory.SUBMIT.equals(a.getCategoryId())) {
schema.patchSetApprovals().insert( schema.patchSetApprovals().insert(
Collections.singleton(new PatchSetApproval(ps.getId(), a))); Collections.singleton(new PatchSetApproval(ps.getId(), a)));
} }