Merge remote-tracking branch 'remotes/origin/ignite-5075-cacheStart' into ignite-5075
# Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6dac535e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6dac535e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6dac535e Branch: refs/heads/ignite-5075 Commit: 6dac535eb0ca6b63aa783c1a24e0aafb69034e72 Parents: 5972cbd Author: sboikov <[email protected]> Authored: Mon May 15 13:24:12 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon May 15 13:24:12 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheIoManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6dac535e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index af9b99e..bb76541 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -142,10 +142,10 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { assert cacheMsg.topologyVersion() != null : cacheMsg; // TODO IGNITE-5075. - AffinityTopologyVersion waitVer = null;//cctx.affinity().localStartVersion(((GridDhtAffinityAssignmentRequest) cacheMsg).groupId()); + AffinityTopologyVersion startTopVer = null;//cctx.affinity().localStartVersion(((GridDhtAffinityAssignmentRequest) cacheMsg).groupId()); - if (waitVer == null) - waitVer = new AffinityTopologyVersion(cctx.localNode().order()); + if (startTopVer == null) + startTopVer = new AffinityTopologyVersion(cctx.localNode().order()); // AffinityTopologyVersion startTopVer = new AffinityTopologyVersion(cctx.localNode().order()); // @@ -165,7 +165,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { if (log.isDebugEnabled()) { log.debug("Wait for exchange before processing message [msg=" + msg + ", node=" + nodeId + - ", waitVer=" + waitVer + + ", waitVer=" + startTopVer + ", cacheDesc=" + cacheDescriptor(cacheMsg) + ']'); }
