Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 130E818A14 for ; Fri, 19 Jun 2015 22:35:23 +0000 (UTC) Received: (qmail 64030 invoked by uid 500); 19 Jun 2015 22:35:23 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 63992 invoked by uid 500); 19 Jun 2015 22:35:22 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 63979 invoked by uid 99); 19 Jun 2015 22:35:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jun 2015 22:35:22 +0000 X-ASF-Spam-Status: No, hits=-2000.4 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 19 Jun 2015 22:33:09 +0000 Received: (qmail 61932 invoked by uid 99); 19 Jun 2015 22:33:41 -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; Fri, 19 Jun 2015 22:33:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6EF7FE3CC5; Fri, 19 Jun 2015 22:33:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 19 Jun 2015 22:33:56 -0000 Message-Id: <40affbfb47bd4d8488e3f76864ed450e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/16] incubator-ignite git commit: IGNITE-1026 - Dynamic cache start fix X-Virus-Checked: Checked by ClamAV on apache.org IGNITE-1026 - Dynamic cache start fix Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/08ea4ccf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/08ea4ccf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/08ea4ccf Branch: refs/heads/ignite-1026 Commit: 08ea4ccf251afc9d485c5409c4b43539d01c62fb Parents: 7cf9d76 Author: Valentin Kulichenko Authored: Fri Jun 19 15:30:38 2015 -0700 Committer: Valentin Kulichenko Committed: Fri Jun 19 15:30:38 2015 -0700 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheProcessor.java | 9 --------- .../store/CacheStoreSessionListenerAbstractSelfTest.java | 1 - 2 files changed, 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08ea4ccf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 4f1a3e6..0f9247f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -1957,17 +1957,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { return new GridFinishedFuture<>(); } - if (CU.affinityNode(ctx.discovery().localNode(), ccfg.getNodeFilter())) { - if (ccfg.getNearConfiguration() != null) - return new GridFinishedFuture<>(); - else - return new GridFinishedFuture<>(new IgniteCheckedException("Failed to start client cache " + - "(local node is an affinity node for cache): " + cacheName)); - } - req.deploymentId(desc.deploymentId()); req.startCacheConfiguration(ccfg); - } if (nearCfg != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08ea4ccf/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java index adac0b2..0634197 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java @@ -145,7 +145,6 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm assertEquals(1, writeCnt.get()); assertEquals(1, deleteCnt.get()); assertEquals(0, reuseCnt.get()); - } /**