opendev/gerrit
Code Issues Proposed changes

Merge "Append vote information to every review event"

Browse Source
This commit is contained in:
David Pursehouse
2015-05-19 05:18:00 +00:00
committed by Gerrit Code Review
parent f646c1ec6d b63d629917
commit c51e257dd4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
View File

@@ -455,10 +455,9 @@ public class PostReview implements RestModifyView<RevisionResource, ReviewInput>
if (ent.getValue() == null || ent.getValue() == 0) { if (ent.getValue() == null || ent.getValue() == 0) {
// User requested delete of this label. // User requested delete of this label.
if (c != null) { if (c != null) {
if (c.getValue() != 0) {
addLabelDelta(normName, (short) 0);
}
del.add(c); del.add(c);
addLabelDelta(normName, (short) 0);
categories.put(normName, (short) 0);
update.putApproval(ent.getKey(), (short) 0); update.putApproval(ent.getKey(), (short) 0);
} }
} else if (c != null && c.getValue() != ent.getValue()) { } else if (c != null && c.getValue() != ent.getValue()) {
@@ -470,6 +469,9 @@ public class PostReview implements RestModifyView<RevisionResource, ReviewInput>
update.putApproval(ent.getKey(), ent.getValue()); update.putApproval(ent.getKey(), ent.getValue());
} else if (c != null && c.getValue() == ent.getValue()) { } else if (c != null && c.getValue() == ent.getValue()) {
current.put(normName, c); current.put(normName, c);
addLabelDelta(normName, c.getValue());
categories.put(normName, c.getValue());
update.putApproval(ent.getKey(), ent.getValue());
} else if (c == null) { } else if (c == null) {
c = new PatchSetApproval(new PatchSetApproval.Key( c = new PatchSetApproval(new PatchSetApproval.Key(
rsrc.getPatchSet().getId(), rsrc.getPatchSet().getId(),