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 7BE5917E97 for ; Wed, 1 Apr 2015 09:12:41 +0000 (UTC) Received: (qmail 7079 invoked by uid 500); 1 Apr 2015 09:12:41 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 7048 invoked by uid 500); 1 Apr 2015 09:12:41 -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 7039 invoked by uid 99); 1 Apr 2015 09:12:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2015 09:12:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_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; Wed, 01 Apr 2015 09:12:16 +0000 Received: (qmail 4418 invoked by uid 99); 1 Apr 2015 09:12:09 -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, 01 Apr 2015 09:12:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BCB84E2F3A; Wed, 1 Apr 2015 09:12:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 01 Apr 2015 09:12:47 -0000 Message-Id: <5e22e01cb2bc4872bd084be7cef77969@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [40/50] incubator-ignite git commit: # IGNITE-644 - Review X-Virus-Checked: Checked by ClamAV on apache.org # IGNITE-644 - Review Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ad140b90 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad140b90 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad140b90 Branch: refs/heads/ignite-gg-9950 Commit: ad140b906526cb95f6db14daf9f1c025e2e45c9d Parents: f1f873b Author: Valentin Kulichenko Authored: Tue Mar 31 14:18:50 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Mar 31 14:18:50 2015 -0700 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgnitionEx.java | 34 +++++++++++--------- 1 file changed, 19 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad140b90/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index 7442d12..5b52919 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -1751,7 +1751,7 @@ public class IgnitionEx { } // Always add marshaller and utility caches. - copies[0] = marshallerSystemCache(); + copies[0] = marshallerSystemCache(clientDisco); copies[1] = utilitySystemCache(clientDisco); cfg.setCacheConfiguration(copies); @@ -1899,20 +1899,24 @@ public class IgnitionEx { * * @return Marshaller system cache configuration. */ - private static CacheConfiguration marshallerSystemCache() { - CacheConfiguration cache = new CacheConfiguration(); - - cache.setName(CU.MARSH_CACHE_NAME); - cache.setCacheMode(REPLICATED); - cache.setAtomicityMode(ATOMIC); - cache.setSwapEnabled(false); - cache.setRebalanceMode(SYNC); - cache.setWriteSynchronizationMode(FULL_SYNC); - cache.setAffinity(new RendezvousAffinityFunction(false, 20)); - cache.setNodeFilter(CacheConfiguration.ALL_NODES); - cache.setStartSize(300); - - return cache; + private static CacheConfiguration marshallerSystemCache(boolean client) { + if (!client) { + CacheConfiguration cache = new CacheConfiguration(); + + cache.setName(CU.MARSH_CACHE_NAME); + cache.setCacheMode(REPLICATED); + cache.setAtomicityMode(ATOMIC); + cache.setSwapEnabled(false); + cache.setRebalanceMode(SYNC); + cache.setWriteSynchronizationMode(FULL_SYNC); + cache.setAffinity(new RendezvousAffinityFunction(false, 20)); + cache.setNodeFilter(CacheConfiguration.ALL_NODES); + cache.setStartSize(300); + + return cache; + } + + return null; } /**