Merge branch '2.2.x' into 2.3.x

Closes gh-22167
2020-06-30 14:09:57 +01:00
parent f86831da9c 64aa418baa
commit 75fc140e2d
2 changed files with 41 additions and 1 deletions
--- 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
@@ -86,7 +86,9 @@ public class TomcatMetricsBinder implements ApplicationListener<ApplicationStart

 	@Override
 	public void destroy() {
-		this.tomcatMetrics.close();
+		if (this.tomcatMetrics != null) {
+			this.tomcatMetrics.close();
+		}
 	}

 }