Remove comments about OpenJDK bug 100167 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
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 0a44b34..02c04f4 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
@@ -714,7 +714,6 @@ private Map<String, LabelWithStatus> initLabels( 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()); for (SubmitRecord rec : submitRecords(cd)) { if (rec.labels == null) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java index 5551320..be31c99 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java
@@ -123,7 +123,6 @@ throws OrmException, PermissionBackendException { LabelTypes labelTypes = cd.getLabelTypes(); - // Don't use Maps.newTreeMap(Comparator) due to OpenJDK bug 100167. out.approvals = new TreeMap<>(labelTypes.nameComparator()); for (PatchSetApproval ca : approvals) { for (PermissionRange pr : cd.changeControl().getLabelRanges()) {