opendev/gerrit
Code Issues Proposed changes

Merge "SubmitStrategyOp: Upsert zeroed labels"

Browse Source
This commit is contained in:
Dave Borowitz
2016-03-25 01:51:57 +00:00
committed by Gerrit Code Review
parent 167e8bbfe6 dd6c16dc67
commit 249b0c8cad
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyOp.java
View File

@@ -361,7 +361,7 @@ abstract class SubmitStrategyOp extends BatchUpdate.Op {
PatchSet.Id psId = update.getPatchSetId();
ctx.getDb().patchSetApprovals().upsert(
convertPatchSet(normalized.getNormalized(), psId));
ctx.getDb().patchSetApprovals().update(
ctx.getDb().patchSetApprovals().upsert(
zero(convertPatchSet(normalized.deleted(), psId)));
for (PatchSetApproval psa : normalized.updated()) {
update.putApprovalFor(psa.getAccountId(), psa.getLabel(), psa.getValue());