From cbe83987d8beee7e3c81c7bfa7b1452f8925aa26 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Mon, 31 Jan 2022 21:39:49 +0000
Subject: [PATCH] Fixed occasional ConcurrentModificationException in the block
 archive reader.

---
 .../qortal/repository/BlockArchiveReader.java | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/qortal/repository/BlockArchiveReader.java b/src/main/java/org/qortal/repository/BlockArchiveReader.java
index cff272a8..b6d7cdd6 100644
--- a/src/main/java/org/qortal/repository/BlockArchiveReader.java
+++ b/src/main/java/org/qortal/repository/BlockArchiveReader.java
@@ -145,20 +145,22 @@ public class BlockArchiveReader {
     }
 
     private String getFilenameForHeight(int height) {
-        Iterator it = this.fileListCache.entrySet().iterator();
-        while (it.hasNext()) {
-            Map.Entry pair = (Map.Entry)it.next();
-            if (pair == null && pair.getKey() == null && pair.getValue() == null) {
-                continue;
-            }
-            Triple<Integer, Integer, Integer> heightInfo = (Triple<Integer, Integer, Integer>) pair.getValue();
-            Integer startHeight = heightInfo.getA();
-            Integer endHeight = heightInfo.getB();
-
-            if (height >= startHeight && height <= endHeight) {
-                // Found the correct file
-                String filename = (String) pair.getKey();
-                return filename;
+        synchronized (this.fileListCache) {
+            Iterator it = this.fileListCache.entrySet().iterator();
+            while (it.hasNext()) {
+                Map.Entry pair = (Map.Entry) it.next();
+                if (pair == null && pair.getKey() == null && pair.getValue() == null) {
+                    continue;
+                }
+                Triple<Integer, Integer, Integer> heightInfo = (Triple<Integer, Integer, Integer>) pair.getValue();
+                Integer startHeight = heightInfo.getA();
+                Integer endHeight = heightInfo.getB();
+
+                if (height >= startHeight && height <= endHeight) {
+                    // Found the correct file
+                    String filename = (String) pair.getKey();
+                    return filename;
+                }
             }
         }