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 71d0f2b9a..45153c6c9 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 { + static class RAComparator implements Comparator { 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 2843ffd29..628cc52b6 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("

\n"); buf.append("

 

"); buf.append("
" + _t("Addresses") + ":"); - for (RouterAddress addr : info.getAddresses()) { + Collection addrs = info.getAddresses(); + if (addrs.size() > 1) { + // addrs is unmodifiable + List laddrs = new ArrayList(addrs); + Collections.sort(laddrs, new NetDbRenderer.RAComparator()); + addrs = laddrs; + } + for (RouterAddress addr : addrs) { String style = addr.getTransportStyle(); buf.append("
").append(DataHelper.stripHTML(style)).append(": "); Map p = addr.getOptionsMap();