From 53b0f0db606580dc79ce740de71c15deaa216158 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 26 Jan 2018 22:09:52 -0800 Subject: [PATCH] Fix NPE when normalizing client tag URIs See gh-11798 --- .../metrics/web/client/MetricsClientHttpRequestInterceptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java index 1c4f79e282..08044ed650 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java @@ -105,7 +105,7 @@ class MetricsClientHttpRequestInterceptor implements ClientHttpRequestIntercepto } private String ensureLeadingSlash(String url) { - return (url.startsWith("/") ? url : "/" + url); + return (url == null || url.startsWith("/") ? url : "/" + url); } }