Repository: cassandra Updated Branches: refs/heads/trunk c35e55de4 -> 4754cddfb
Fix non-fatal NPE in CompactionMetrics patch by Achal Shah; reviewed by Robert Stupp for CASSANDRA-11961 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4754cddf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4754cddf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4754cddf Branch: refs/heads/trunk Commit: 4754cddfb980226326994b60383ef83baed06714 Parents: c35e55d Author: Achal Shah <[email protected]> Authored: Fri Jun 17 20:17:08 2016 +0200 Committer: Robert Stupp <[email protected]> Committed: Fri Jun 17 20:17:08 2016 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/metrics/CompactionMetrics.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4754cddf/src/java/org/apache/cassandra/metrics/CompactionMetrics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/CompactionMetrics.java b/src/java/org/apache/cassandra/metrics/CompactionMetrics.java index f3a9d00..9d2863f 100644 --- a/src/java/org/apache/cassandra/metrics/CompactionMetrics.java +++ b/src/java/org/apache/cassandra/metrics/CompactionMetrics.java @@ -100,6 +100,10 @@ public class CompactionMetrics implements CompactionManager.CompactionExecutorSt for (CompactionInfo.Holder compaction : compactions) { CFMetaData metaData = compaction.getCompactionInfo().getCFMetaData(); + if (metaData == null) + { + continue; + } if (!resultMap.containsKey(metaData.ksName)) { resultMap.put(metaData.ksName, new HashMap<>());
