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 C01F01759C for ; Tue, 9 Jun 2015 10:04:57 +0000 (UTC) Received: (qmail 12290 invoked by uid 500); 9 Jun 2015 10:04:57 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 12258 invoked by uid 500); 9 Jun 2015 10:04:57 -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 12249 invoked by uid 99); 9 Jun 2015 10:04:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jun 2015 10:04:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 09 Jun 2015 10:02:44 +0000 Received: (qmail 10970 invoked by uid 99); 9 Jun 2015 10:04:31 -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; Tue, 09 Jun 2015 10:04:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6334BE00E0; Tue, 9 Jun 2015 10:04:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 09 Jun 2015 10:04:37 -0000 Message-Id: <4e1b4c6cf94c4dc583df97c040fbb272@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/50] incubator-ignite git commit: Merge branches 'ignite-gg-9621' and 'ignite-sprint-5' X-Virus-Checked: Checked by ClamAV on apache.org 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 Authored: Thu Jun 4 17:12:15 2015 +0700 Committer: AKuznetsov 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);