Merge branches 'ignite-gg-9621' and 'ignite-sprint-5'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2b443d90 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2b443d90 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2b443d90 Branch: refs/heads/ignite-648 Commit: 2b443d9096c4bc434bd99b2c675bbcbf7e65f236 Parents: 1f516a2 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Jun 4 17:12:15 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Jun 4 17:12:15 2015 +0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/visor/cache/VisorCache.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2b443d90/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java index bd24ecf..9e15d2d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java @@ -202,7 +202,7 @@ public class VisorCache implements Serializable { offHeapAllocatedSize = ca.offHeapAllocatedSize(); offHeapEntriesCnt = ca.offHeapEntriesCount(); partitions = ca.affinity().partitions(); - metrics = VisorCacheMetrics.from(ignite, ca); + metrics = VisorCacheMetrics.from(ignite, cacheName); estimateMemorySize(ignite, ca, sample);
