From d845c0b0fa1145399e6685b213ca814126e7df32 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 19 May 2015 18:33:57 +0900 Subject: [PATCH] Revert "Append vote information to every review event" This reverts commit b63d6299175fa00cae46112d8988fb3c3b379ad6. Breaks the following acceptance tests. - SubmitByMergeAlwaysIT - SubmitByRebaseIfNecessaryIT - SubmitByFastForwardIT - SubmitByMergeIfNecessaryIT - SubmitByCherryPickIT Change-Id: I1d58f2e81d77d8f0a4211661e1b592116e2c2fbf --- .../java/com/google/gerrit/server/change/PostReview.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java index c1fdb39205..e10077afd6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java @@ -455,9 +455,10 @@ public class PostReview implements RestModifyView if (ent.getValue() == null || ent.getValue() == 0) { // User requested delete of this label. if (c != null) { + if (c.getValue() != 0) { + addLabelDelta(normName, (short) 0); + } del.add(c); - addLabelDelta(normName, (short) 0); - categories.put(normName, (short) 0); update.putApproval(ent.getKey(), (short) 0); } } else if (c != null && c.getValue() != ent.getValue()) { @@ -469,9 +470,6 @@ public class PostReview implements RestModifyView update.putApproval(ent.getKey(), ent.getValue()); } else if (c != null && c.getValue() == ent.getValue()) { current.put(normName, c); - addLabelDelta(normName, c.getValue()); - categories.put(normName, c.getValue()); - update.putApproval(ent.getKey(), ent.getValue()); } else if (c == null) { c = new PatchSetApproval(new PatchSetApproval.Key( rsrc.getPatchSet().getId(),