Halt the chain download when the future is cancelled (or otherwise co…

…mpleted). (PegaSysEng#901)
rain-on · Feb 20, 2019 · 92bb480 · 92bb480
1 parent fda78b7
commit 92bb480
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainDownloader.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/ChainDownloader.java
@@ -90,7 +90,10 @@ public CompletableFuture<?> getCurrentTask() {
     return currentTask;
   }
 
-  private CompletableFuture<?> executeDownload() {
+  private void executeDownload() {
+    if (downloadFuture.isDone()) {
+      return;
+    }
     // Find target, pull checkpoint headers, import, repeat
     currentTask =
         waitForPeers()
@@ -124,7 +127,6 @@ private CompletableFuture<?> executeDownload() {
                     downloadFuture.complete(null);
                   }
                 });
-    return currentTask;
   }
 
   private CompletableFuture<List<BlockHeader>> pullCheckpointHeaders(final SyncTarget syncTarget) {