Gracefully handle null readers in MetricExportAutoConfiguration

54b06131 · Andy Wilkinson · d8af7980 · 54b06131
Commit 54b06131 authored May 18, 2015 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

MetricExportAutoConfiguration.java .../actuate/autoconfigure/MetricExportAutoConfiguration.java +2 -2

No files found.
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfiguration.java
@@ -69,8 +69,8 @@ public class MetricExportAutoConfiguration {

 		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]));
 		}