Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java (revision f82fb5ca6d1c628d6e423e470305734ced31dc2b) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java (revision 83d7b2734db4a418e05de730d8ca9c773ba8766c) @@ -57,7 +57,6 @@ import static org.apache.ignite.cache.CacheRebalanceMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.GridTopic.*; -import static org.apache.ignite.internal.IgniteNodeAttributes.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; /** Index: ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java (revision f82fb5ca6d1c628d6e423e470305734ced31dc2b) +++ ../incubator-ignite/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java (revision 4ba8b6f4c3b4e90345ebf67ad0750fd4a6cfb662) @@ -497,6 +497,9 @@ 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); + NearCacheConfiguration nearCfg = cfg.getNearConfiguration(); if (nearCfg != null) @@ -1356,6 +1359,9 @@ cacheCtx.cache(dht); } + if (!CU.isUtilityCache(cache.name()) && !CU.isSystemCache(cache.name())) + registerMbean(cache.mxBean(), U.maskName(cache.name()) + "_" + ctx.gridName(), false); + return ret; } @@ -2940,7 +2946,7 @@ cacheName = near ? cacheName + "-near" : cacheName; for (Class itf : o.getClass().getInterfaces()) { - if (itf.getName().endsWith("MBean")) { + if (itf.getName().endsWith("MBean") || itf.getName().endsWith("MXBean")) { try { U.registerCacheMBean(srvr, ctx.gridName(), cacheName, o.getClass().getName(), o, (Class)itf); @@ -2973,7 +2979,7 @@ cacheName = near ? cacheName + "-near" : cacheName; for (Class itf : o.getClass().getInterfaces()) { - if (itf.getName().endsWith("MBean")) { + if (itf.getName().endsWith("MBean") || itf.getName().endsWith("MXBean")) { try { srvr.unregisterMBean(U.makeCacheMBeanName(ctx.gridName(), cacheName, o.getClass().getName())); }