NPE when mBeanClientPollingFailure is thrown (#19)

* fix - return an empty list instead of bug * bump version * bump version
logzio · Nov 13, 2017 · dbd4037 · dbd4037
1 parent f1627e3
commit dbd4037
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -233,6 +233,8 @@ docker push logzio/jmx2graphite
 
 
 # Changelog
+- v1.2.3
+  - Fixed an NPE when poll() resulted in MBeanClient.MBeanClientPollingFailure
 - v1.2.1
   - Fixed a bug when no protocol was provided
   - Fixed log4j dependencies

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ apply plugin: "com.github.johnrengelman.shadow"
 mainClassName = 'io.logz.jmx2graphite.Jmx2GraphiteJolokia'
 
 group = "io.logz"
-version = "1.2.2"
+version = "1.2.3"
 
 repositories {
     mavenCentral()

diff --git a/src/main/java/io/logz/jmx2graphite/MetricsPipeline.java b/src/main/java/io/logz/jmx2graphite/MetricsPipeline.java
@@ -5,6 +5,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -53,7 +54,8 @@ private List<MetricValue> poll() {
             } else {
                 logger.warn("Failed polling metrics from client ({}): {}", client.getClass().toString(), e.getMessage());
             }
-            return null;
+
+            return Collections.emptyList();
         }
     }