Merge branch 'master' into ignite-2523-1 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationFilter.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e43db04e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e43db04e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e43db04e Branch: refs/heads/ignite-2523-1 Commit: e43db04e6862161026fa5537bedc1d4c6a236321 Parents: 7f993fa e833eb2 Author: vozerov-gridgain <[email protected]> Authored: Wed Apr 20 10:13:53 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Apr 20 10:13:53 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/CacheOperationFilter.java | 4 ++-- .../distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e43db04e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java index 844c4b3,abfc5c9..5428209 --- 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 @@@ -129,7 -128,8 +128,8 @@@ public class GridNearAtomicSingleUpdate GridNearAtomicUpdateResponse res = null; synchronized (mux) { - GridNearAtomicAbstractUpdateRequest req = this.req.nodeId().equals(nodeId) ? this.req : null; - GridNearAtomicUpdateRequest req = this.req != null && this.req.nodeId().equals(nodeId) ? ++ GridNearAtomicAbstractUpdateRequest req = this.req != null && this.req.nodeId().equals(nodeId) ? + this.req : null; if (req != null && req.response() == null) { res = new GridNearAtomicUpdateResponse(cctx.cacheId(),
