ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [3/5] incubator-ignite git commit: IGNITE-1172 Fixed tests.
Date Mon, 03 Aug 2015 11:49:41 GMT
IGNITE-1172 Fixed tests.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4ba8b6f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4ba8b6f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4ba8b6f4

Branch: refs/heads/ignite-1.3.3
Commit: 4ba8b6f4c3b4e90345ebf67ad0750fd4a6cfb662
Parents: 9389c6e
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Mon Aug 3 13:20:44 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Mon Aug 3 13:20:44 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheProcessor.java       | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba8b6f4/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 fc6054b..a83fd4c 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,9 +497,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         cleanup(cfg, cfg.getAffinityMapper(), false);
         cleanup(cfg, cctx.store().configuredStore(), false);
 
-        if (cfg.isStatisticsEnabled() && !CU.isUtilityCache(cctx.cache().name())
-            && !CU.isSystemCache(cctx.cache().name()))
-            cleanup(cfg, cctx.cache().name(), 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();
 
@@ -1360,8 +1359,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
             cacheCtx.cache(dht);
         }
 
-        if (cfg.isStatisticsEnabled() && !CU.isUtilityCache(cache.name()) &&
!CU.isSystemCache(cache.name()))
-            prepare(cfg, cache.mxBean(), false);
+        if (!CU.isUtilityCache(cache.name()) && !CU.isSystemCache(cache.name()))
+            registerMbean(cache.mxBean(), U.maskName(cache.name()) + "_" + ctx.gridName(),
false);
 
         return ret;
     }


Mime
View raw message