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 4893F18FAB for ; Wed, 5 Aug 2015 08:27:54 +0000 (UTC) Received: (qmail 73332 invoked by uid 500); 5 Aug 2015 08:27:41 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 73297 invoked by uid 500); 5 Aug 2015 08:27: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 73288 invoked by uid 99); 5 Aug 2015 08:27:41 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Aug 2015 08:27:41 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id F0D521A976B for ; Wed, 5 Aug 2015 08:27:40 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id XFK3sJdQT0u0 for ; Wed, 5 Aug 2015 08:27:33 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 9477F42B19 for ; Wed, 5 Aug 2015 08:27:32 +0000 (UTC) Received: (qmail 72864 invoked by uid 99); 5 Aug 2015 08:27:32 -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, 05 Aug 2015 08:27:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D8194E1869; Wed, 5 Aug 2015 08:27:31 +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, 05 Aug 2015 08:27:34 -0000 Message-Id: In-Reply-To: <54c3c9d50033457b96768212494242c9@git.apache.org> References: <54c3c9d50033457b96768212494242c9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/14] incubator-ignite git commit: IGNITE-1172 CacheMetricsMBeans registered/unregistred on start/stop cache. IGNITE-1172 CacheMetricsMBeans registered/unregistred on start/stop cache. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9389c6e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9389c6e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9389c6e3 Branch: refs/heads/master Commit: 9389c6e3ed79e5b9800b5aec076fbfee843c38ec Parents: 83d7b27 Author: nikolay_tikhonov Authored: Mon Aug 3 12:12:49 2015 +0300 Committer: nikolay_tikhonov Committed: Mon Aug 3 12:12:49 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9389c6e3/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 77d41f8..fc6054b 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 @@ -497,7 +497,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { cleanup(cfg, cfg.getAffinityMapper(), false); cleanup(cfg, cctx.store().configuredStore(), false); - if (!CU.isUtilityCache(cctx.cache().name()) && !CU.isSystemCache(cctx.cache().name())) + if (cfg.isStatisticsEnabled() && !CU.isUtilityCache(cctx.cache().name()) + && !CU.isSystemCache(cctx.cache().name())) cleanup(cfg, cctx.cache().name(), false); NearCacheConfiguration nearCfg = cfg.getNearConfiguration(); @@ -1359,7 +1360,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { cacheCtx.cache(dht); } - if (!CU.isUtilityCache(cache.name()) && !CU.isSystemCache(cache.name())) + if (cfg.isStatisticsEnabled() && !CU.isUtilityCache(cache.name()) && !CU.isSystemCache(cache.name())) prepare(cfg, cache.mxBean(), false); return ret;