opendev/gerrit
Code Issues Proposed changes

Remove comments about OpenJDK bug 100167

Browse Source 
These days, since we have the diamond operator, we tend to prefer using
native constructors instead of the Guava variants anyway, so we are not
especially tempted to write Maps.newTreeMap. And it's quite likely that
OpenJDK 8 doesn't have this bug anymore anyway (but it's actually hard
to tell because I can't find this bug on their bug tracker, only the
Guava reference at https://github.com/google/guava/issues/635).

Change-Id: Ia93a5aff30c8a30caa0119c2a592b792e3ef147e
This commit is contained in:
Dave Borowitz
2017-09-05 09:33:21 -04:00
parent b1fad26e6f
commit 853dea9945
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
View File

@@ -714,7 +714,6 @@ public class ChangeJson {
private Map<String, LabelWithStatus> initLabels( private Map<String, LabelWithStatus> initLabels(
ChangeData cd, LabelTypes labelTypes, boolean standard) throws OrmException { ChangeData cd, LabelTypes labelTypes, boolean standard) throws OrmException {
// Don't use Maps.newTreeMap(Comparator) due to OpenJDK bug 100167.
Map<String, LabelWithStatus> labels = new TreeMap<>(labelTypes.nameComparator()); Map<String, LabelWithStatus> labels = new TreeMap<>(labelTypes.nameComparator());
for (SubmitRecord rec : submitRecords(cd)) { for (SubmitRecord rec : submitRecords(cd)) {
if (rec.labels == null) { if (rec.labels == null) {

1
gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java
View File

@@ -123,7 +123,6 @@ public class ReviewerJson {
throws OrmException, PermissionBackendException { throws OrmException, PermissionBackendException {
LabelTypes labelTypes = cd.getLabelTypes(); LabelTypes labelTypes = cd.getLabelTypes();
// Don't use Maps.newTreeMap(Comparator) due to OpenJDK bug 100167.
out.approvals = new TreeMap<>(labelTypes.nameComparator()); out.approvals = new TreeMap<>(labelTypes.nameComparator());
for (PatchSetApproval ca : approvals) { for (PatchSetApproval ca : approvals) {
for (PermissionRange pr : cd.changeControl().getLabelRanges()) { for (PermissionRange pr : cd.changeControl().getLabelRanges()) {