From cd0bb969dbdebfe3b8808dc14dba2d1dcefe6dfb Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 10 Aug 2021 09:58:18 +0200
Subject: [PATCH] Fix Potential NPE in TomcatMetricsBinder.findContext()

Closes gh-27576
---
 .../actuate/metrics/web/tomcat/TomcatMetricsBinder.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/tomcat/TomcatMetricsBinder.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/tomcat/TomcatMetricsBinder.java
index 38920b56c60..0932218080f 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/tomcat/TomcatMetricsBinder.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/tomcat/TomcatMetricsBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,7 +69,9 @@ public class TomcatMetricsBinder implements ApplicationListener<ApplicationStart
 			WebServer webServer = ((WebServerApplicationContext) applicationContext).getWebServer();
 			if (webServer instanceof TomcatWebServer) {
 				Context context = findContext((TomcatWebServer) webServer);
-				return context.getManager();
+				if (context != null) {
+					return context.getManager();
+				}
 			}
 		}
 		return null;