Gracefully handle null readers in MetricExportAutoConfiguration

Eviradnus · May 18, 2015 · 54b0613 · 54b0613
1 parent d8af798
commit 54b0613
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...in/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfiguration.java b/...in/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfiguration.java
@@ -69,8 +69,8 @@ public SchedulingConfigurer metricWritersMetricExporter() {
 
 		Map<String, MetricWriter> writers = new HashMap<String, MetricWriter>();
 
-		MetricReader reader = endpointReader;
-		if (reader == null && !this.readers.isEmpty()) {
+		MetricReader reader = this.endpointReader;
+		if (reader == null && this.readers != null && !this.readers.isEmpty()) {
 			reader = new CompositeMetricReader(this.readers.toArray(new MetricReader[0]));
 		}