Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-02 05:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

PeerGroup: Don't stop peer discovery if one peer discoverer throws an exception.

Browse Source
This commit is contained in:
Oscar Guindzberg
2019-02-12 15:05:58 -03:00
committed by Andreas Schildbach
parent a9b40c358f
commit 76f6f0c21f
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/org/bitcoinj/core/PeerGroup.java
View File

@@ -460,11 +460,7 @@ public class PeerGroup implements TransactionBroadcaster {
// Don't hold the lock across discovery as this process can be very slow. // Don't hold the lock across discovery as this process can be very slow.
boolean discoverySuccess = false; boolean discoverySuccess = false;
if (doDiscovery) { if (doDiscovery) {
try { discoverySuccess = discoverPeers() > 0;
discoverySuccess = discoverPeers() > 0;
} catch (PeerDiscoveryException e) {
log.error("Peer discovery failure", e);
}
} }
long retryTime; long retryTime;
@@ -922,7 +918,7 @@ public class PeerGroup implements TransactionBroadcaster {
} }
/** Returns number of discovered peers. */ /** Returns number of discovered peers. */
protected int discoverPeers() throws PeerDiscoveryException { protected int discoverPeers() {
// Don't hold the lock whilst doing peer discovery: it can take a long time and cause high API latency. // Don't hold the lock whilst doing peer discovery: it can take a long time and cause high API latency.
checkState(!lock.isHeldByCurrentThread()); checkState(!lock.isHeldByCurrentThread());
int maxPeersToDiscoverCount = this.vMaxPeersToDiscoverCount; int maxPeersToDiscoverCount = this.vMaxPeersToDiscoverCount;
@@ -931,7 +927,12 @@ public class PeerGroup implements TransactionBroadcaster {
final List<PeerAddress> addressList = Lists.newLinkedList(); final List<PeerAddress> addressList = Lists.newLinkedList();
for (PeerDiscovery peerDiscovery : peerDiscoverers /* COW */) { for (PeerDiscovery peerDiscovery : peerDiscoverers /* COW */) {
InetSocketAddress[] addresses; InetSocketAddress[] addresses;
addresses = peerDiscovery.getPeers(requiredServices, peerDiscoveryTimeoutMillis, TimeUnit.MILLISECONDS); try {
addresses = peerDiscovery.getPeers(requiredServices, peerDiscoveryTimeoutMillis, TimeUnit.MILLISECONDS);
} catch (PeerDiscoveryException e) {
log.warn(e.getMessage());
continue;
}
for (InetSocketAddress address : addresses) addressList.add(new PeerAddress(params, address)); for (InetSocketAddress address : addresses) addressList.add(new PeerAddress(params, address));
if (addressList.size() >= maxPeersToDiscoverCount) break; if (addressList.size() >= maxPeersToDiscoverCount) break;
} }