From d6c7eff8f7d6eb22fbff5cb7138330397543f49c Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Tue, 17 Jul 2018 12:01:26 +0200
Subject: [PATCH] Add check for empty values for lookup

Closes gh-13419
---
 .../actuate/autoconfigure/metrics/PropertiesMeterFilter.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java
index 2ed427e4a3..7edd6caa97 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilter.java
@@ -74,6 +74,9 @@ public class PropertiesMeterFilter implements MeterFilter {
 	}
 
 	private <T> T lookup(Map<String, T> values, Id id, T defaultValue) {
+		if (values.isEmpty()) {
+			return defaultValue;
+		}
 		String name = id.getName();
 		while (StringUtils.hasLength(name)) {
 			T result = values.get(name);