diff options
author | Bruce Zu <bruce.zu@sonymobile.com> | 2013-09-24 18:17:41 +0800 |
---|---|---|
committer | Bruce Zu <bruce.zu@sonymobile.com> | 2013-09-30 09:40:28 +0000 |
commit | 1d0673b5f4e46fa147941a4d5b6845a8e08ae8c5 (patch) | |
tree | 1edfe3df658800c2810a890a85f201608a26bff1 | |
parent | b78d04e534dbc93975e0ce2d955f9c4f36e56c93 (diff) |
Fix: Duplicate options of permitted_labels.
For a given LABEL, e.g. named Qualified, When
the SubmitRecord.Label value is like
'NOT_READY[Qualified: OK, Code-Review: NEED, Qualified: MAY]'
the Qualified options will show duplicated options on WebUI.
Reason: ListMultimap is used to keep permitted_labels and
its values. Fixed by replacing ListMultimap by SetMultimap.
Please note this change only affects permitted_labels.
Change-Id: I8c9683474650233cd131236e78281e67967c2a12
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java index ce6ab2e90a..b1d060359e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java @@ -30,11 +30,12 @@ import com.google.common.base.Strings; import com.google.common.collect.HashBasedTable; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; -import com.google.common.collect.LinkedListMultimap; +import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; +import com.google.common.collect.SetMultimap; import com.google.common.collect.Sets; import com.google.common.collect.Table; import com.google.gerrit.common.changes.ListChangesOption; @@ -576,7 +577,7 @@ public class ChangeJson { } LabelTypes labelTypes = ctl.getLabelTypes(); - ListMultimap<String, String> permitted = LinkedListMultimap.create(); + SetMultimap<String, String> permitted = LinkedHashMultimap.create(); for (SubmitRecord rec : submitRecords(cd)) { if (rec.labels == null) { continue; |