From bf3a8dc08554885ea867b28a85b23834d161d134 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Wed, 26 Dec 2012 18:55:17 +0000 Subject: [PATCH] Clear a minor FindBugs warning. --- .../com/google/bitcoin/core/PeerGroup.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/core/src/main/java/com/google/bitcoin/core/PeerGroup.java b/core/src/main/java/com/google/bitcoin/core/PeerGroup.java index af1cc29f..694ab9e9 100644 --- a/core/src/main/java/com/google/bitcoin/core/PeerGroup.java +++ b/core/src/main/java/com/google/bitcoin/core/PeerGroup.java @@ -1100,18 +1100,9 @@ public class PeerGroup extends AbstractIdleService { return freqHeights[s - 1]; } - private static class PeerAndPing implements Comparable { + private static class PeerAndPing { Peer peer; long pingTime; - - public int compareTo(PeerAndPing peerAndPing) { - if (pingTime < peerAndPing.pingTime) - return -1; - else if (pingTime == peerAndPing.pingTime) - return 0; - else - return 1; - } } /** Given a list of Peers, return a Peer to be used as the download peer. */ @@ -1147,7 +1138,18 @@ public class PeerGroup extends AbstractIdleService { candidates2.add(pap); } } - Collections.sort(candidates2); + // Sort by ping time. + Collections.sort(candidates2, new Comparator() { + public int compare(PeerAndPing peerAndPing, PeerAndPing peerAndPing2) { + if (peerAndPing.pingTime < peerAndPing2.pingTime) + return -1; + else if (peerAndPing.pingTime == peerAndPing2.pingTime) + return 0; + else + return 1; + + } + }); return candidates2.get(0).peer; }