From 54b0613179b8fa01633f5b408fd1f136b557a278 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 18 May 2015 16:29:55 +0100
Subject: [PATCH] Gracefully handle null readers in
 MetricExportAutoConfiguration

---
 .../actuate/autoconfigure/MetricExportAutoConfiguration.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 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
index 4c4f0ef9f42..b7d63aeb4dd 100644
--- 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]));
 		}