commit 70adeaeb92a05d209fc64c94cbd2fea3df90c912
author Dave Borowitz <dborowitz@google.com> Thu Jul 25 09:11:36 2013 -0700
committer Dave Borowitz <dborowitz@google.com> Thu Jul 25 10:32:36 2013 -0700
tree 705a6859683a3d3a0ea12c0c9bd00c12b7c5f65b
parent 89c3c582b6c94032f537d045f34d23f072e96a05

Normalize label names in PostReview

Labels are looked up case-insensitively so votes are applied
properly, but the names used in changes messages and events matched
the case provided by the user. Fix this to use the canonical label
case instead.

Bug: Issue 2033
Change-Id: I5d17afea35d6e0ca960845a470535a1abcd8432a

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

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 772ce12..b9ca124 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
@@ -424,11 +424,12 @@
       }
 
       PatchSetApproval c = current.remove(name);
+      String normName = lt.getName();
       if (ent.getValue() == null || ent.getValue() == 0) {
         // User requested delete of this label.
         if (c != null) {
           if (c.getValue() != 0) {
-            labelDelta.add("-" + name);
+            labelDelta.add("-" + normName);
           }
           del.add(c);
         }
@@ -437,10 +438,10 @@
         c.setGranted(timestamp);
         c.cache(change);
         upd.add(c);
-        labelDelta.add(format(name, c.getValue()));
-        categories.put(name, c.getValue());
+        labelDelta.add(format(normName, c.getValue()));
+        categories.put(normName, c.getValue());
       } else if (c != null && c.getValue() == ent.getValue()) {
-        current.put(name, c);
+        current.put(normName, c);
       } else if (c == null) {
         c = new PatchSetApproval(new PatchSetApproval.Key(
                 rsrc.getPatchSet().getId(),
@@ -450,8 +451,8 @@
         c.setGranted(timestamp);
         c.cache(change);
         ins.add(c);
-        labelDelta.add(format(name, c.getValue()));
-        categories.put(name, c.getValue());
+        labelDelta.add(format(normName, c.getValue()));
+        categories.put(normName, c.getValue());
       }
     }