Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 89DBD200C85 for ; Mon, 15 May 2017 12:25:32 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 88A57160BC2; Mon, 15 May 2017 10:25:32 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9E625160BDA for ; Mon, 15 May 2017 12:25:31 +0200 (CEST) Received: (qmail 7220 invoked by uid 500); 15 May 2017 10:25:30 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 6973 invoked by uid 99); 15 May 2017 10:25:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 May 2017 10:25:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 90576E9671; Mon, 15 May 2017 10:25:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Mon, 15 May 2017 10:25:43 -0000 Message-Id: In-Reply-To: <722a550ce2e647a386436d66ff61b4d1@git.apache.org> References: <722a550ce2e647a386436d66ff61b4d1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/14] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-5075-cacheStart' into ignite-5075 archived-at: Mon, 15 May 2017 10:25:32 -0000 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 Authored: Mon May 15 13:24:12 2017 +0300 Committer: sboikov 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) + ']'); }