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 46131200CCA for ; Wed, 19 Jul 2017 10:39:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 447E41688AD; Wed, 19 Jul 2017 08:39:17 +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 8A5901688AA for ; Wed, 19 Jul 2017 10:39:16 +0200 (CEST) Received: (qmail 13297 invoked by uid 500); 19 Jul 2017 08:39:15 -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 13288 invoked by uid 99); 19 Jul 2017 08:39:15 -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, 19 Jul 2017 08:39:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 66D5BE024D; Wed, 19 Jul 2017 08:39:15 +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 Message-Id: <6bc5fc5a31b94564bc4ac6831535a850@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-5578 Date: Wed, 19 Jul 2017 08:39:15 +0000 (UTC) archived-at: Wed, 19 Jul 2017 08:39:17 -0000 Repository: ignite Updated Branches: refs/heads/ignite-5578-locJoin f006bfb88 -> dd44df9a7 ignite-5578 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dd44df9a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dd44df9a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dd44df9a Branch: refs/heads/ignite-5578-locJoin Commit: dd44df9a76c8fbb5511a1bb415691b2e1973391d Parents: f006bfb Author: sboikov Authored: Wed Jul 19 11:39:08 2017 +0300 Committer: sboikov Committed: Wed Jul 19 11:39:08 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheAffinitySharedManager.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/dd44df9a/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 8a293ae..a59f5d7 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 @@ -518,11 +518,13 @@ public class CacheAffinitySharedManager extends GridCacheSharedManagerAdap } for (DynamicCacheDescriptor desc : startDescs) { - CacheGroupContext grp = cctx.cache().cacheGroup(desc.groupId()); + if (desc.cacheConfiguration().getCacheMode() != LOCAL) { + CacheGroupContext grp = cctx.cache().cacheGroup(desc.groupId()); - assert grp != null; + assert grp != null; - grp.topology().onExchangeDone(grp.affinity().cachedAffinity(topVer), true); + grp.topology().onExchangeDone(grp.affinity().cachedAffinity(topVer), true); + } } cctx.cache().initCacheProxies(topVer, null);