From 381c032cecd040af7f896820483722bad3390252 Mon Sep 17 00:00:00 2001 From: catbref Date: Tue, 1 Oct 2019 12:59:54 +0100 Subject: [PATCH] Fixed Network's broken choice of next connectable peer. Slight improvement to comment in Peer. --- src/main/java/org/qora/network/Network.java | 3 +-- src/main/java/org/qora/network/Peer.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/qora/network/Network.java b/src/main/java/org/qora/network/Network.java index 52e8aabc..a441fe35 100644 --- a/src/main/java/org/qora/network/Network.java +++ b/src/main/java/org/qora/network/Network.java @@ -597,8 +597,7 @@ public class Network extends Thread { // Don't consider peers with recent connection failures final long lastAttemptedThreshold = now - CONNECT_FAILURE_BACKOFF; peers.removeIf(peerData -> peerData.getLastAttempted() != null && - peerData.getLastConnected() != null && - peerData.getLastConnected() < peerData.getLastAttempted() && + (peerData.getLastConnected() == null || peerData.getLastConnected() < peerData.getLastAttempted()) && peerData.getLastAttempted() > lastAttemptedThreshold); // Don't consider peers that we know loop back to ourself diff --git a/src/main/java/org/qora/network/Peer.java b/src/main/java/org/qora/network/Peer.java index 6b9904da..ee80b9f4 100644 --- a/src/main/java/org/qora/network/Peer.java +++ b/src/main/java/org/qora/network/Peer.java @@ -317,7 +317,7 @@ public class Peer { } if (message == null && bytesRead == 0 && !wasByteBufferFull) - // No complete message in buffer, no more bytes to read from socket and there was room to read bytes + // No complete message in buffer, no more bytes to read from socket even though there was room to read bytes return; if (message == null)