You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2017/09/29 20:36:49 UTC
storm git commit: guard against NPE if a reporter does not have
filters
Repository: storm
Updated Branches:
refs/heads/metrics_v2 20a1cdc9b -> a47b5fbda
guard against NPE if a reporter does not have filters
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a47b5fbd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a47b5fbd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a47b5fbd
Branch: refs/heads/metrics_v2
Commit: a47b5fbdae0f46eeb4344937b56a6b2126315954
Parents: 20a1cdc
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Sep 29 16:37:25 2017 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Sep 29 16:37:25 2017 -0400
----------------------------------------------------------------------
.../metrics2/reporters/ScheduledStormReporter.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a47b5fbd/storm-core/src/jvm/org/apache/storm/metrics2/reporters/ScheduledStormReporter.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/metrics2/reporters/ScheduledStormReporter.java b/storm-core/src/jvm/org/apache/storm/metrics2/reporters/ScheduledStormReporter.java
index 6ef39b6..e88b41b 100644
--- a/storm-core/src/jvm/org/apache/storm/metrics2/reporters/ScheduledStormReporter.java
+++ b/storm-core/src/jvm/org/apache/storm/metrics2/reporters/ScheduledStormReporter.java
@@ -74,13 +74,15 @@ public abstract class ScheduledStormReporter implements StormReporter{
public static StormMetricsFilter getMetricsFilter(Map reporterConf){
StormMetricsFilter filter = null;
Map<String, Object> filterConf = (Map)reporterConf.get("filter");
- String clazz = (String) filterConf.get("class");
- if(filterConf != null && clazz != null){
- try {
- filter = (StormMetricsFilter) Metrics2Utils.instantiate(clazz);
- filter.prepare(filterConf);
- } catch (Exception e) {
- LOG.warn("Unable to instantiate StormMetricsFilter class: {}", clazz);
+ if(filterConf != null) {
+ String clazz = (String) filterConf.get("class");
+ if (clazz != null) {
+ try {
+ filter = (StormMetricsFilter) Metrics2Utils.instantiate(clazz);
+ filter.prepare(filterConf);
+ } catch (Exception e) {
+ LOG.warn("Unable to instantiate StormMetricsFilter class: {}", clazz);
+ }
}
}
return filter;