Changeset 363aaadb

Timestamp:

Jun 2, 2018 12:28:50 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

06106c75

Parents:

7713284

Message:

Console: Sort tunnels within pools by expiration (ticket #2232)

File:

• apps/routerconsole/java/src/net/i2p/router/web/helpers/TunnelRenderer.java (modified) (2 diffs)

apps/routerconsole/java/src/net/i2p/router/web/helpers/TunnelRenderer.java

@@ -211 +211 @@
          public int compare(HopConfig l, HopConfig r) {
              return (r.getProcessedMessagesCount() - l.getProcessedMessagesCount());
+        }
+    }
+
+    /** @since 0.9.35 */
+    private static class TunnelInfoComparator implements Comparator<TunnelInfo>, Serializable {
+         public int compare(TunnelInfo l, TunnelInfo r) {
+             long le = l.getExpiration();
+             long re = r.getExpiration();
+             if (le < re)
+                 return -1;
+             if (le > re)
+                 return 1;
+             return 0;
         }
     }
@@ -248 +261 @@
 
     private void renderPool(Writer out, TunnelPool in, TunnelPool outPool) throws IOException {
-        List<TunnelInfo> tunnels = null;
-        if (in == null)
+        Comparator<TunnelInfo> comp = new TunnelInfoComparator();
+        List<TunnelInfo> tunnels;
+        if (in == null) {
             tunnels = new ArrayList<TunnelInfo>();
-        else
+        } else {
             tunnels = in.listTunnels();
-        if (outPool != null)
-            tunnels.addAll(outPool.listTunnels());
+            Collections.sort(tunnels, comp);
+        }
+        if (outPool != null) {
+            List<TunnelInfo> otunnels = outPool.listTunnels();
+            Collections.sort(otunnels, comp);
+            tunnels.addAll(otunnels);
+        }
 
         long processedIn = (in != null ? in.getLifetimeProcessed() : 0);