crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Fixed Network's broken choice of next connectable peer.

Browse Source 
Slight improvement to comment in Peer.
This commit is contained in:
catbref 2019-10-01 12:59:54 +01:00
parent 568a1f8a30
commit 381c032cec
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/qora/network/Network.java
View File

@ -597,8 +597,7 @@ public class Network extends Thread {
// Don't consider peers with recent connection failures // Don't consider peers with recent connection failures
final long lastAttemptedThreshold = now - CONNECT_FAILURE_BACKOFF; final long lastAttemptedThreshold = now - CONNECT_FAILURE_BACKOFF;
peers.removeIf(peerData -> peerData.getLastAttempted() != null && peers.removeIf(peerData -> peerData.getLastAttempted() != null &&
peerData.getLastConnected() != null && (peerData.getLastConnected() == null || peerData.getLastConnected() < peerData.getLastAttempted()) &&
peerData.getLastConnected() < peerData.getLastAttempted() &&
peerData.getLastAttempted() > lastAttemptedThreshold); peerData.getLastAttempted() > lastAttemptedThreshold);
// Don't consider peers that we know loop back to ourself // Don't consider peers that we know loop back to ourself

2
src/main/java/org/qora/network/Peer.java
View File

@ -317,7 +317,7 @@ public class Peer {
} }
if (message == null && bytesRead == 0 && !wasByteBufferFull) 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; return;
if (message == null) if (message == null)