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 6633E182AE for ; Mon, 3 Aug 2015 12:46:01 +0000 (UTC) Received: (qmail 98247 invoked by uid 500); 3 Aug 2015 12:46:01 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 98212 invoked by uid 500); 3 Aug 2015 12:46:01 -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 98203 invoked by uid 99); 3 Aug 2015 12:46:01 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Aug 2015 12:46:01 +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 BBAA41A949C for ; Mon, 3 Aug 2015 12:46:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.79 X-Spam-Level: * X-Spam-Status: No, score=1.79 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01] 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 3pu6ME4NiXMt for ; Mon, 3 Aug 2015 12:45:45 +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 74F3A5069A for ; Mon, 3 Aug 2015 12:45:41 +0000 (UTC) Received: (qmail 97743 invoked by uid 99); 3 Aug 2015 12:45: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; Mon, 03 Aug 2015 12:45:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C50BBE091F; Mon, 3 Aug 2015 12:45:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 03 Aug 2015 12:45:49 -0000 Message-Id: <3293bfebbfe04436ae3d0a0f353eb9ee@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/12] incubator-ignite git commit: IGNITE-1172 Fixed review notes. IGNITE-1172 Fixed review notes. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3ace82ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3ace82ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3ace82ac Branch: refs/heads/ignite-support804 Commit: 3ace82ac5ea85da5cd0883eb4da794f0609a8218 Parents: 4ba8b6f Author: nikolay_tikhonov Authored: Mon Aug 3 14:22:08 2015 +0300 Committer: nikolay_tikhonov Committed: Mon Aug 3 14:22:08 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ace82ac/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 a83fd4c..8e2b20e 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,8 +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())) - unregisterMbean(cctx.cache().mxBean(), U.maskName(cctx.cache().name()) + "_" + ctx.gridName(), false); + if (!CU.isUtilityCache(cfg.getName()) && !CU.isSystemCache(cfg.getName())) + unregisterMbean(cctx.cache().mxBean(), cfg.getName(), false); NearCacheConfiguration nearCfg = cfg.getNearConfiguration(); @@ -1360,7 +1360,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { } if (!CU.isUtilityCache(cache.name()) && !CU.isSystemCache(cache.name())) - registerMbean(cache.mxBean(), U.maskName(cache.name()) + "_" + ctx.gridName(), false); + registerMbean(cache.mxBean(), cache.name(), false); return ret; }