opendev/gerrit
Code Issues Proposed changes

Revert "Append vote information to every review event"

Browse Source 
This reverts commit b63d629917.

Breaks the following acceptance tests.

- SubmitByMergeAlwaysIT
- SubmitByRebaseIfNecessaryIT
- SubmitByFastForwardIT
- SubmitByMergeIfNecessaryIT
- SubmitByCherryPickIT

Change-Id: I1d58f2e81d77d8f0a4211661e1b592116e2c2fbf
This commit is contained in:
David Pursehouse
2015-05-19 18:33:57 +09:00
parent 65202de88c
commit d845c0b0fa
1 changed files with 3 additions and 5 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,9 +455,10 @@ 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) {
del.add(c); if (c.getValue() != 0) {
addLabelDelta(normName, (short) 0); addLabelDelta(normName, (short) 0);
categories.put(normName, (short) 0); }
del.add(c);
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()) {
@@ -469,9 +470,6 @@ 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(),