From 7029d3ab2ff6af49171a1327f7d6d9d5ffe8a55e Mon Sep 17 00:00:00 2001
From: Ilya Kaznacheev <ilya.kaznacheev@chronicle.software>
Date: Mon, 30 Aug 2021 12:43:08 +0300
Subject: [PATCH] Search for next replication entry inside iteration context

Fixes ChronicleEnterprise/Chronicle-Map-Enterprise#69
---
 .../openhft/chronicle/map/ReplicatedChronicleMap.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
index 86e63bdd8..827a281c7 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
@@ -919,12 +919,12 @@ public class ReplicatedChronicleMap<K, V, R> extends VanillaChronicleMap<K, V, R
             throwExceptionIfClosed();
 
             while (true) {
-                final long nextEntryPos = nextEntryPos(callback, chronicleId);
-                if (nextEntryPos == NOT_FOUND)
-                    return false;
-                entryPos = nextEntryPos;
-
                 try (CompiledReplicatedMapIterationContext<K, V, R> context = iterationContext()) {
+                    final long nextEntryPos = nextEntryPos(callback, chronicleId);
+                    if (nextEntryPos == NOT_FOUND)
+                        return false;
+                    entryPos = nextEntryPos;
+
                     if (segmentIndex >= 0) {
                         // we are in first tiers (aka "segments")
                         context.initSegmentIndex(segmentIndex);