Repository: ignite Updated Branches: refs/heads/master 97b70b901 -> 48de89e86
IGNITE-7398 Disabled MBean registration for cache group if IGNITE_MBEANS_DISABLED set to true - Fixes #3492. Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/48de89e8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/48de89e8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/48de89e8 Branch: refs/heads/master Commit: 48de89e86a3c953ddca8cf31e33ff781f73403f4 Parents: 97b70b9 Author: pvinokurov <vinokurov.pa...@gmail.com> Authored: Mon Feb 26 15:51:22 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Mon Feb 26 15:51:22 2018 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/48de89e8/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 8db4567..4648f25 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 @@ -621,7 +621,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (Object obj : grp.configuredUserObjects()) cleanup(cfg, obj, false); - if (!grp.systemCache()) { + if (!grp.systemCache() && !U.IGNITE_MBEANS_DISABLED) { try { ctx.config().getMBeanServer().unregisterMBean(U.makeMBeanName(ctx.igniteInstanceName(), CACHE_GRP_METRICS_MBEAN_GRP, grp.cacheOrGroupName())); @@ -1986,7 +1986,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { CacheGroupContext old = cacheGrps.put(desc.groupId(), grp); - if (!grp.systemCache()) { + if (!grp.systemCache() && !U.IGNITE_MBEANS_DISABLED) { try { U.registerMBean(ctx.config().getMBeanServer(), ctx.igniteInstanceName(), CACHE_GRP_METRICS_MBEAN_GRP, grp.cacheOrGroupName(), grp.mxBean(), CacheGroupMetricsMXBean.class);
