diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java index 71d0f2b9a60999b37d5e4418f6066fc1bdda4755..45153c6c9aa3bd1a1dd7b104a73a9e9a39446c44 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java @@ -805,7 +805,7 @@ class NetDbRenderer { * Sort by style, then host * @since 0.9.38 */ - private static class RAComparator implements Comparator<RouterAddress> { + static class RAComparator implements Comparator<RouterAddress> { private static final long serialVersionUID = 1L; public int compare(RouterAddress l, RouterAddress r) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java index 2843ffd2971417dc69d65933c4035d925cc0a533..628cc52b6fbff65776cbd7ce63aea58a1938e18b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java @@ -7,6 +7,7 @@ import java.math.BigInteger; import java.text.Collator; import java.text.DecimalFormat; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.Date; @@ -912,7 +913,14 @@ class SybilRenderer { .append(info.getIdentity().getSigningPublicKey().getType().toString()).append("</p>\n"); buf.append("<p class=\"sybil_filler\"> </p>"); buf.append("</div></td></tr><tr><td class=\"sybil_addresses\" colspan=\"3\"><table><tr><td><b>" + _t("Addresses") + ":</b></td><td>"); - for (RouterAddress addr : info.getAddresses()) { + Collection<RouterAddress> addrs = info.getAddresses(); + if (addrs.size() > 1) { + // addrs is unmodifiable + List<RouterAddress> laddrs = new ArrayList<RouterAddress>(addrs); + Collections.sort(laddrs, new NetDbRenderer.RAComparator()); + addrs = laddrs; + } + for (RouterAddress addr : addrs) { String style = addr.getTransportStyle(); buf.append("<br><b class=\"netdb_transport\">").append(DataHelper.stripHTML(style)).append(":</b> "); Map<Object, Object> p = addr.getOptionsMap();