Repository: eagle Updated Branches: refs/heads/master 812002740 -> 4e228a8de
[MINOR] Fix Topology Check system config thrown NullPointerException bug When 'dataSourceConfig.system.enabled' is false, NullPointerException will thrown out Author: koone <[email protected]> Closes #892 from koone/fixbug. Project: http://git-wip-us.apache.org/repos/asf/eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/4e228a8d Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/4e228a8d Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/4e228a8d Branch: refs/heads/master Commit: 4e228a8ded607a9e77676e7f48463a02d1145022 Parents: 8120027 Author: koone <[email protected]> Authored: Tue Mar 28 05:21:52 2017 +0000 Committer: r7raul1984 <[email protected]> Committed: Tue Mar 28 05:21:52 2017 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/eagle/topology/TopologyCheckApp.java | 2 +- .../java/org/apache/eagle/topology/TopologyCheckAppConfig.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/eagle/blob/4e228a8d/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/TopologyCheckApp.java ---------------------------------------------------------------------- diff --git a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/TopologyCheckApp.java b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/TopologyCheckApp.java index df14bfa..2d49c2a 100644 --- a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/TopologyCheckApp.java +++ b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/TopologyCheckApp.java @@ -73,7 +73,7 @@ public class TopologyCheckApp extends StormApplication { ).setNumTasks(topologyCheckAppConfig.dataExtractorConfig.numKafkaSinkBolt).shuffleGrouping(parseBoltName); // system check data collector - if (topologyCheckAppConfig.systemConfig.systemInstanceEnable) { + if (null != topologyCheckAppConfig.systemConfig) { topologyBuilder.setSpout( systemSpoutName, new KafkaSpoutProvider(SYSTEM_COLLECTOR_CONFIG_PREFIX).getSpout(config), http://git-wip-us.apache.org/repos/asf/eagle/blob/4e228a8d/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/TopologyCheckAppConfig.java ---------------------------------------------------------------------- diff --git a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/TopologyCheckAppConfig.java b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/TopologyCheckAppConfig.java index b67867b..9a51db2 100644 --- a/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/TopologyCheckAppConfig.java +++ b/eagle-topology-check/eagle-topology-app/src/main/java/org/apache/eagle/topology/TopologyCheckAppConfig.java @@ -123,7 +123,6 @@ public class TopologyCheckAppConfig implements Serializable { systemConfig.systemInstanceKafkaSchemeCls = getOptionalConfig("dataSourceConfig.system.schemeCls", null); systemConfig.systemInstanceZkQuorum = getOptionalConfig("dataSourceConfig.system.zkConnection", null); systemConfig.systemInstanceSendBatchSize = config.getInt("dataSourceConfig.system.dataSendBatchSize"); - systemConfig.systemInstanceEnable = config.getBoolean("dataSourceConfig.system.enabled"); } } @@ -161,7 +160,6 @@ public class TopologyCheckAppConfig implements Serializable { public String systemInstanceZkQuorum; public String systemInstanceKafkaSchemeCls; public int systemInstanceSendBatchSize; - public boolean systemInstanceEnable; } private String getOptionalConfig(String key, String defaultValue) {
