Merge pull request #260 from jpbempel/jpbempel/fixNPEhandling

Fix NPE handling
DataDog · Feb 11, 2020 · 0e5c78d · 0e5c78d
2 parents 06092cb + 48bbe41
commit 0e5c78d
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/main/java/org/datadog/jmxfetch/Instance.java b/src/main/java/org/datadog/jmxfetch/Instance.java
@@ -147,11 +147,9 @@ public Instance(
  this.minCollectionPeriod = (Integer) initConfig.get("min_collection_interval");
  }
 
- try {
- this.emptyDefaultHostname = (Boolean) this.instanceMap.get("empty_default_hostname");
- } catch (NullPointerException e) {
- this.emptyDefaultHostname = false;
- }
+ Object emptyDefaultHostnameObj = this.instanceMap.get("empty_default_hostname");
+ this.emptyDefaultHostname =
+ emptyDefaultHostnameObj != null ? (Boolean) emptyDefaultHostnameObj : false;
 
  this.lastCollectionTime = 0;
  this.lastRefreshTime = 0;