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 168C81733B for ; Tue, 21 Apr 2015 11:07:45 +0000 (UTC) Received: (qmail 53706 invoked by uid 500); 21 Apr 2015 11:07:45 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 53675 invoked by uid 500); 21 Apr 2015 11:07:45 -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 53664 invoked by uid 99); 21 Apr 2015 11:07:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Apr 2015 11:07:44 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of root@apache.org designates 54.164.171.186 as permitted sender) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Apr 2015 11:07:40 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 766A945487 for ; Tue, 21 Apr 2015 11:06:30 +0000 (UTC) Received: (qmail 44196 invoked by uid 99); 21 Apr 2015 11:06:29 -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, 21 Apr 2015 11:06:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B7420E0D65; Tue, 21 Apr 2015 11:06:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 21 Apr 2015 11:07:14 -0000 Message-Id: In-Reply-To: <753ca04abf8c4615b96b8b586aef0bd7@git.apache.org> References: <753ca04abf8c4615b96b8b586aef0bd7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [47/51] incubator-ignite git commit: ignite-762 NPE at org.apache.ignite.internal.processors.cache.GridCacheSwapManager.swapSize X-Virus-Checked: Checked by ClamAV on apache.org ignite-762 NPE at org.apache.ignite.internal.processors.cache.GridCacheSwapManager.swapSize Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aaa5ceef Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aaa5ceef Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aaa5ceef Branch: refs/heads/ignite-gg-9702 Commit: aaa5ceef5a46b1bc84c03d9fdfe23ec7f86b7023 Parents: d0e606f Author: agura Authored: Fri Apr 17 15:48:00 2015 +0300 Committer: agura Committed: Mon Apr 20 17:55:40 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/managers/discovery/GridDiscoveryManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaa5ceef/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index bb49fed..11fa261 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -660,7 +660,7 @@ public class GridDiscoveryManager extends GridManagerAdapter { Map metrics = null; for (GridCacheAdapter cache : caches) { - if (cache.configuration().isStatisticsEnabled()) { + if (cache.context().started() && cache.configuration().isStatisticsEnabled()) { if (metrics == null) metrics = U.newHashMap(caches.size());