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 458A717C93 for ; Wed, 1 Apr 2015 08:34:02 +0000 (UTC) Received: (qmail 16774 invoked by uid 500); 1 Apr 2015 08:34:02 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 16701 invoked by uid 500); 1 Apr 2015 08:34:02 -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 16684 invoked by uid 99); 1 Apr 2015 08:34:02 -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 08:34:02 +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 08:33:37 +0000 Received: (qmail 10146 invoked by uid 99); 1 Apr 2015 08:32:20 -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 08:32:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D415EE1827; Wed, 1 Apr 2015 08:32:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 01 Apr 2015 08:32:26 -0000 Message-Id: <795c6b3b49164fd78dd47993c390baf7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/50] incubator-ignite git commit: # ignite-sprint-3 Added support for nodes filters and minor cleanup of configs. X-Virus-Checked: Checked by ClamAV on apache.org # ignite-sprint-3 Added support for nodes filters and minor cleanup of configs. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/768ca6aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/768ca6aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/768ca6aa Branch: refs/heads/ignite-639 Commit: 768ca6aab93c63f37e506318065bb491870ee8f4 Parents: bca4198 Author: AKuznetsov Authored: Tue Mar 31 11:44:10 2015 +0700 Committer: AKuznetsov Committed: Tue Mar 31 11:44:10 2015 +0700 ---------------------------------------------------------------------- .../visor/cache/VisorCacheStoreConfiguration.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/768ca6aa/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java index 7284b7d..a4a2235 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java @@ -22,6 +22,7 @@ import org.apache.ignite.cache.store.*; import org.apache.ignite.cache.store.jdbc.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -67,13 +68,16 @@ public class VisorCacheStoreConfiguration implements Serializable { private int flushThreadCnt; /** + * @param ignite Ignite instance. * @param ccfg Cache configuration. * @return Data transfer object for cache store configuration properties. */ public static VisorCacheStoreConfiguration from(Ignite ignite, CacheConfiguration ccfg) { VisorCacheStoreConfiguration cfg = new VisorCacheStoreConfiguration(); - CacheStore store = ((IgniteKernal)ignite).internalCache(ccfg.getName()).context().store().configuredStore(); + GridCacheAdapter c = ((IgniteKernal)ignite).internalCache(ccfg.getName()); + + CacheStore store = c != null && c.context().started() ? c.context().store().configuredStore() : null; cfg.jdbcStore = store instanceof CacheAbstractJdbcStore; @@ -156,10 +160,10 @@ public class VisorCacheStoreConfiguration implements Serializable { } /** - * @param batchSize New maximum batch size for write-behind cache store operations. + * @param batchSz New maximum batch size for write-behind cache store operations. */ - public void batchSize(int batchSize) { - this.batchSz = batchSize; + public void batchSize(int batchSz) { + this.batchSz = batchSz; } /** @@ -184,10 +188,10 @@ public class VisorCacheStoreConfiguration implements Serializable { } /** - * @param flushSize New maximum object count in write-behind cache. + * @param flushSz New maximum object count in write-behind cache. */ - public void flushSize(int flushSize) { - this.flushSz = flushSize; + public void flushSize(int flushSz) { + this.flushSz = flushSz; } /**