From 853dea994538856b0e79a6a86a945076a92d3df3 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Tue, 5 Sep 2017 09:33:21 -0400 Subject: [PATCH] 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 --- .../main/java/com/google/gerrit/server/change/ChangeJson.java | 1 - .../main/java/com/google/gerrit/server/change/ReviewerJson.java | 1 - 2 files changed, 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 0a44b341a1..02c04f4d9f 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 @@ public class ChangeJson { private Map initLabels( ChangeData cd, LabelTypes labelTypes, boolean standard) throws OrmException { - // Don't use Maps.newTreeMap(Comparator) due to OpenJDK bug 100167. Map 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 55513201cc..be31c99e2d 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 @@ public class ReviewerJson { 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()) {