downloadFailCount check after increment.

nayutaco · Jul 25, 2019 · 17a975b · 17a975b
1 parent 865c203
commit 17a975b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/src/co/nayuta/lightning/Ptarmigan.java b/src/co/nayuta/lightning/Ptarmigan.java
@@ -478,11 +478,6 @@ private int getTxConfirmationFromBlock(PtarmiganChannel channel, Sha256Hash txHa
             while (true) {
                 Block block = getBlock(blockHash);
                 if (block == null) {
-                    if (downloadFailCount >= DOWNLOAD_FAIL_COUNT_MAX) {
-                        //
-                        logger.error("stop SPV: too many fail download");
-                        throw new PtarmException();
-                    }
                     break;
                 }
                 logger.debug("getTxConfirmationFromBlock: blockHash(conf=" + (c + 1) + ")=" + blockHash.toString());
@@ -1348,6 +1343,11 @@ private Block getBlockFromPeer(Sha256Hash blockHash) throws PtarmException {
         } catch (Exception e) {
             downloadFailCount++;
             logger.error("getBlockFromPeer(count=" + downloadFailCount + "): " + getStackTrace(e));
+            if (downloadFailCount >= DOWNLOAD_FAIL_COUNT_MAX) {
+                //
+                logger.error("stop SPV: too many fail download");
+                throw new PtarmException();
+            }
         }
         return block;
     }