opendev/gerrit
Code Issues Proposed changes

Merge "Labels: Fix NPE on merged change with no approvals"

Browse Source
This commit is contained in:
David Pursehouse 2016-02-08 05:06:36 +00:00 committed by Gerrit Code Review
commit 3f6d7b141b
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java
View File

@ -279,17 +279,21 @@ class Labels extends Grid {
String votableCategories = "";
if (votable != null) {
Set<String> s = votable.get(ai._accountId()).votableLabels();
if (!s.isEmpty()) {
StringBuilder sb = new StringBuilder(Util.C.votable());
sb.append(" ");
for (Iterator<String> it = s.iterator(); it.hasNext();) {
sb.append(it.next());
if (it.hasNext()) {
sb.append(", ");
VotableInfo vi = votable.get(ai._accountId());
if (vi != null) {
Set<String> s = vi.votableLabels();
if (!s.isEmpty()) {
StringBuilder sb = new StringBuilder(Util.C.votable());
sb.append(" ");
for (Iterator<String> it = vi.votableLabels().iterator();
it.hasNext();) {
sb.append(it.next());
if (it.hasNext()) {
sb.append(", ");
}
}
votableCategories = sb.toString();
}
votableCategories = sb.toString();
}
}
html.openSpan()