From 22efaccd4aca79f397551804f610d913465cf1a1 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sun, 22 Aug 2021 15:20:28 +0100 Subject: [PATCH] Fixed NPE introduced in earlier commit. --- src/main/java/org/qortal/controller/Controller.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/qortal/controller/Controller.java b/src/main/java/org/qortal/controller/Controller.java index 2b0a6b8f..26fc7fcc 100644 --- a/src/main/java/org/qortal/controller/Controller.java +++ b/src/main/java/org/qortal/controller/Controller.java @@ -1415,10 +1415,12 @@ public class Controller extends Thread { BlockData blockData = repository.getBlockRepository().fromReference(parentSignature); - if (PruneManager.getInstance().isBlockPruned(blockData.getHeight(), repository)) { - // If this request contains a pruned block, we likely only have partial data, so best not to sent anything - // We always prune from the oldest first, so it's fine to just check the first block requested - blockData = null; + if (blockData != null) { + if (PruneManager.getInstance().isBlockPruned(blockData.getHeight(), repository)) { + // If this request contains a pruned block, we likely only have partial data, so best not to sent anything + // We always prune from the oldest first, so it's fine to just check the first block requested + blockData = null; + } } while (blockData != null && blockSummaries.size() < numberRequested) {