BlockFileLoader: On an unexpected problem, wrap exception with additi…

…onal information.
bitcoinj · Apr 6, 2018 · 7c270c2 · 7c270c2
1 parent 11d7f15
commit 7c270c2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/core/src/main/java/org/bitcoinj/utils/BlockFileLoader.java b/core/src/main/java/org/bitcoinj/utils/BlockFileLoader.java
@@ -85,6 +85,7 @@ public static File defaultBlocksDir() {
     }
 
     private Iterator<File> fileIt;
+    private File file = null;
     private FileInputStream currentFileStream = null;
     private Block nextBlock = null;
     private NetworkParameters params;
@@ -136,8 +137,9 @@ private void loadNextBlock() {
                     currentFileStream = null;
                     return;
                 }
+                file = fileIt.next();
                 try {
-                    currentFileStream = new FileInputStream(fileIt.next());
+                    currentFileStream = new FileInputStream(file);
                 } catch (FileNotFoundException e) {
                     currentFileStream = null;
                 }
@@ -172,6 +174,8 @@ private void loadNextBlock() {
                 } catch (ProtocolException e) {
                     nextBlock = null;
                     continue;
+                } catch (Exception e) {
+                    throw new RuntimeException("unexpected problem with block in " + file, e);
                 }
                 break;
             } catch (IOException e) {