Repository: ignite Updated Branches: refs/heads/ignite-4705-debug 377404691 -> 35f234781
ignite-4705 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2b38fd9b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2b38fd9b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2b38fd9b Branch: refs/heads/ignite-4705-debug Commit: 2b38fd9b0ab53b56872b358b60b3e59294d7e779 Parents: 512655b Author: sboikov <[email protected]> Authored: Tue Mar 7 11:20:51 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Mar 7 11:20:51 2017 +0300 ---------------------------------------------------------------------- .../dht/atomic/GridNearAtomicSingleUpdateFuture.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2b38fd9b/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 cea314c..6b88bcf 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 @@ -139,12 +139,12 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda GridNearAtomicCheckUpdateRequest checkReq = null; + boolean rcvAll = false; + synchronized (mux) { if (reqState == null) return false; - boolean rcvAll = false; - if (reqState.req.nodeId.equals(nodeId)) { GridNearAtomicAbstractUpdateRequest req = reqState.processPrimaryResponse(nodeId); @@ -178,7 +178,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda if (checkReq != null) sendCheckUpdateRequest(checkReq); - else + else if (rcvAll) finishUpdateFuture(opRes0, err0, remapTopVer0); return false;
