Repository: ignite Updated Branches: refs/heads/ignite-4424 f5db458a8 -> 8c47ab468
IGNITE-4424 REPLICATED cache isn't synced across nodes Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8c47ab46 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8c47ab46 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8c47ab46 Branch: refs/heads/ignite-4424 Commit: 8c47ab468004c8449449069a77c5a81cd2f4236f Parents: f5db458 Author: Anton Vinogradov <a...@apache.org> Authored: Mon Dec 26 16:45:40 2016 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Mon Dec 26 16:45:40 2016 +0300 ---------------------------------------------------------------------- .../distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java | 2 +- .../cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8c47ab46/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java index 97a0b41..7376aff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java @@ -470,7 +470,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda singleReq0 = mapSingleUpdate(topVer, futVer, updVer); synchronized (mux) { - assert this.futVer == futVer || this.error() != null; + assert this.futVer == futVer || (this.isDone() && this.error() != null); assert this.topVer == topVer; this.updVer = updVer; http://git-wip-us.apache.org/repos/asf/ignite/blob/8c47ab46/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index fc944f3..950e5bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -675,7 +675,7 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu } synchronized (mux) { - assert this.futVer == futVer || this.error() != null; + assert this.futVer == futVer || (this.isDone() && this.error() != null); assert this.topVer == topVer; this.updVer = updVer;
