From 60de795949636cd99ee21bddd6368f74ee3d6517 Mon Sep 17 00:00:00 2001 From: leventov Date: Sun, 20 Dec 2015 18:33:47 +0300 Subject: [PATCH] updateChange() should always be called after replicationStateUpdate(), because updateChange() uses the new timestamp --- .../map/impl/stage/iter/ReplicatedMapSegmentIteration.java | 4 ++-- .../chronicle/map/impl/stage/query/ReplicatedMapQuery.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapSegmentIteration.java b/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapSegmentIteration.java index 8e0e16eec..90675d930 100644 --- a/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapSegmentIteration.java +++ b/src/main/java/net/openhft/chronicle/map/impl/stage/iter/ReplicatedMapSegmentIteration.java @@ -74,8 +74,8 @@ public abstract class ReplicatedMapSegmentIteration extends MapSegmentI checkOnEachPublicOperation.checkOnEachPublicOperation(); try { entry.innerDefaultReplaceValue(newValue); - ru.updateChange(); e.updatedReplicationStateOnPresentEntry(); + ru.updateChange(); } finally { s.innerWriteLock.unlock(); } @@ -138,8 +138,8 @@ public abstract class ReplicatedMapSegmentIteration extends MapSegmentI e.innerDefaultReplaceValue(value); s.incrementModCount(); e.writeEntryPresent(); - ru.updateChange(); e.updatedReplicationStateOnPresentEntry(); + ru.updateChange(); } finally { s.innerWriteLock.unlock(); } diff --git a/src/main/java/net/openhft/chronicle/map/impl/stage/query/ReplicatedMapQuery.java b/src/main/java/net/openhft/chronicle/map/impl/stage/query/ReplicatedMapQuery.java index 612911432..8f3dd3f49 100644 --- a/src/main/java/net/openhft/chronicle/map/impl/stage/query/ReplicatedMapQuery.java +++ b/src/main/java/net/openhft/chronicle/map/impl/stage/query/ReplicatedMapQuery.java @@ -95,7 +95,7 @@ public abstract class ReplicatedMapQuery extends MapQuery @Override public void doReplaceValue(Data newValue) { super.doReplaceValue(newValue); - ru.updateChange(); e.updatedReplicationStateOnPresentEntry(); + ru.updateChange(); } }