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 7313F200CA3 for ; Thu, 18 May 2017 00:24:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 71B22160BCB; Wed, 17 May 2017 22:24:01 +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 2F0CD160BDA for ; Thu, 18 May 2017 00:24:00 +0200 (CEST) Received: (qmail 56298 invoked by uid 500); 17 May 2017 22:23:59 -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 55997 invoked by uid 99); 17 May 2017 22:23:59 -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; Wed, 17 May 2017 22:23:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0B70CF21A9; Wed, 17 May 2017 22:23:59 +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: Wed, 17 May 2017 22:24:11 -0000 Message-Id: <553581a8a5694d8c9eea2550ab5dd48b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [14/15] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-5075-cacheStart' into ignite-5075 archived-at: Wed, 17 May 2017 22:24:01 -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/CacheClientReconnectDiscoveryData.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cd27689e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cd27689e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cd27689e Branch: refs/heads/ignite-5075 Commit: cd27689e657f60fee1a5eb2e8edd3955f58e730b Parents: a7bc895 Author: sboikov Authored: Wed May 17 23:12:47 2017 +0300 Committer: sboikov Committed: Wed May 17 23:12:47 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheAffinitySharedManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cd27689e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java index 49b765f..7db6dc2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java @@ -852,18 +852,18 @@ public class CacheAffinitySharedManager extends GridCacheSharedManagerAdap } /** - * @param grpDesc Cache group descriptor. + * @param desc Cache group descriptor. * @param aff Affinity. * @param fut Exchange future. * @param fetch Force fetch flag. * @throws IgniteCheckedException If failed. */ - private void initAffinity(CacheGroupDescriptor grpDesc, + private void initAffinity(CacheGroupDescriptor desc, GridAffinityAssignmentCache aff, GridDhtPartitionsExchangeFuture fut, boolean fetch) throws IgniteCheckedException { - assert desc != null; + assert desc != null : aff.cacheOrGroupName(); if (!fetch && canCalculateAffinity(desc, aff, fut)) { List> assignment = aff.calculate(fut.topologyVersion(), fut.discoveryEvent(), fut.discoCache()); @@ -872,7 +872,7 @@ public class CacheAffinitySharedManager extends GridCacheSharedManagerAdap } else { GridDhtAssignmentFetchFuture fetchFut = new GridDhtAssignmentFetchFuture(cctx, - grpDesc, + desc, fut.topologyVersion(), fut.discoCache());