You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2020/01/29 09:30:25 UTC
[ignite] branch master updated: IGNITE-12580: NPE in
GridMetricManager. (#7317)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 54a051b IGNITE-12580: NPE in GridMetricManager. (#7317)
54a051b is described below
commit 54a051b9621b433112ebfe27411fad36aadc416f
Author: Nikolay <ni...@apache.org>
AuthorDate: Wed Jan 29 12:30:12 2020 +0300
IGNITE-12580: NPE in GridMetricManager. (#7317)
---
.../ignite/internal/processors/metric/GridMetricManager.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java
index 8ad0a5e..56886c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/GridMetricManager.java
@@ -386,14 +386,19 @@ public class GridMetricManager extends GridManagerAdapter<MetricExporterSpi> imp
notifyListeners(mreg, metricRegRemoveLsnrs, log);
+ DistributedMetaStorage metastorage0 = metastorage;
+
+ if (metastorage0 == null)
+ return;
+
try {
GridCompoundFuture opsFut = new GridCompoundFuture<>();
for (Metric m : mreg) {
if (m instanceof HitRateMetric)
- opsFut.add(metastorage.removeAsync(metricName(HITRATE_CFG_PREFIX, m.name())));
+ opsFut.add(metastorage0.removeAsync(metricName(HITRATE_CFG_PREFIX, m.name())));
else if (m instanceof HistogramMetric)
- opsFut.add(metastorage.removeAsync(metricName(HISTOGRAM_CFG_PREFIX, m.name())));
+ opsFut.add(metastorage0.removeAsync(metricName(HISTOGRAM_CFG_PREFIX, m.name())));
}
opsFut.markInitialized();