PeerGroup: Add additional check isRunning() at handlePeerDeath to avo…

…id errors at shutDown when using BlockingClient Cherry pick 4fed629
bisq-network · Feb 12, 2019 · f76d341 · f76d341
1 parent 3f1382d
commit f76d341
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/core/src/main/java/org/bitcoinj/core/PeerGroup.java b/core/src/main/java/org/bitcoinj/core/PeerGroup.java
@@ -1805,6 +1805,13 @@ protected void handlePeerDeath(final Peer peer, @Nullable Throwable exception) {
                 final Peer newDownloadPeer = selectDownloadPeer(peers);
                 if (newDownloadPeer != null) {
                     setDownloadPeer(newDownloadPeer);
+
+                    // When using BlockingClient we get errors at shutdown caused by
+                    // startBlockChainDownloadFromPeer()
+                    // We add another check to terminate here if we have been shut down already
+                    if (!isRunning())
+                        return;
+
                     if (downloadListener != null) {
                         startBlockChainDownloadFromPeer(newDownloadPeer);
                     }