Defer disabling registry until Tomcat server is being created

Closes gh-16498

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfiguration.java

@@ -65,6 +65,14 @@ public ReactiveWebServerFactoryCustomizer reactiveWebServerFactoryCustomizer(
 		return new ReactiveWebServerFactoryCustomizer(serverProperties);
 	}
 
+
+	@Bean
+	@ConditionalOnClass(name = "org.apache.catalina.startup.Tomcat")
+	public TomcatReactiveWebServerFactoryCustomizer tomcatReactiveWebServerFactoryCustomizer(
+			ServerProperties serverProperties) {
+		return new TomcatReactiveWebServerFactoryCustomizer(serverProperties);
+	}
+
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnProperty(value = "server.forward-headers-strategy",

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryConfiguration.java

@@ -24,7 +24,6 @@
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.web.embedded.jetty.JettyReactiveWebServerFactory;
 import org.springframework.boot.web.embedded.jetty.JettyServerCustomizer;
 import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory;
@@ -99,12 +98,6 @@ public TomcatReactiveWebServerFactory tomcatReactiveWebServerFactory(
 			return factory;
 		}
 
-		@Bean
-		public TomcatReactiveWebServerFactoryCustomizer tomcatReactiveWebServerFactoryCustomizer(
-				ServerProperties serverProperties) {
-			return new TomcatReactiveWebServerFactoryCustomizer(serverProperties);
-		}
-
 	}
 
 	@Configuration(proxyBeanMethods = false)

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/TomcatReactiveWebServerFactoryCustomizer.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.autoconfigure.web.reactive;
 
-import org.apache.tomcat.util.modeler.Registry;
-
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.web.embedded.tomcat.TomcatReactiveWebServerFactory;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
@@ -40,9 +38,8 @@ public TomcatReactiveWebServerFactoryCustomizer(ServerProperties serverPropertie
 
 	@Override
 	public void customize(TomcatReactiveWebServerFactory factory) {
-		if (!this.serverProperties.getTomcat().getMbeanregistry().isEnabled()) {
-			Registry.disableRegistry();
-		}
+		factory.setDisableMBeanRegistry(
+				!this.serverProperties.getTomcat().getMbeanregistry().isEnabled());
 	}
 
 }

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/TomcatServletWebServerFactoryCustomizer.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.autoconfigure.web.servlet;
 
-import org.apache.tomcat.util.modeler.Registry;
-
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.web.embedded.tomcat.ConfigurableTomcatWebServerFactory;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
@@ -62,9 +60,7 @@ public void customize(TomcatServletWebServerFactory factory) {
 			customizeUseRelativeRedirects(factory,
 					tomcatProperties.getUseRelativeRedirects());
 		}
-		if (!tomcatProperties.getMbeanregistry().isEnabled()) {
-			Registry.disableRegistry();
-		}
+		factory.setDisableMBeanRegistry(!tomcatProperties.getMbeanregistry().isEnabled());
 	}
 
 	private void customizeRedirectContextRoot(ConfigurableTomcatWebServerFactory factory,

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java

@@ -36,6 +36,7 @@
 import org.apache.coyote.AbstractProtocol;
 import org.apache.coyote.ProtocolHandler;
 import org.apache.coyote.http2.Http2Protocol;
+import org.apache.tomcat.util.modeler.Registry;
 import org.apache.tomcat.util.scan.StandardJarScanFilter;
 
 import org.springframework.boot.util.LambdaSafe;
@@ -82,6 +83,8 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac
 
 	private int backgroundProcessorDelay;
 
+	private boolean disableMBeanRegistry = true;
+
 	/**
 	 * Create a new {@link TomcatServletWebServerFactory} instance.
 	 */
@@ -106,6 +109,9 @@ private static List<LifecycleListener> getDefaultLifecycleListeners() {
 
 	@Override
 	public WebServer getWebServer(HttpHandler httpHandler) {
+		if (this.disableMBeanRegistry) {
+			Registry.disableRegistry();
+		}
 		Tomcat tomcat = new Tomcat();
 		File baseDir = (this.baseDirectory != null) ? this.baseDirectory
 				: createTempDir("tomcat");
@@ -413,4 +419,14 @@ public void setProtocol(String protocol) {
 		this.protocol = protocol;
 	}
 
+	/**
+	 * Set whether the factory should disable Tomcat's MBean registry prior to creating
+	 * the server.
+	 * @param disableMBeanRegistry whether to disable the MBean registry
+	 * @since 2.2.0
+	 */
+	public void setDisableMBeanRegistry(boolean disableMBeanRegistry) {
+		this.disableMBeanRegistry = disableMBeanRegistry;
+	}
+
 }

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java

@@ -60,6 +60,7 @@
 import org.apache.coyote.AbstractProtocol;
 import org.apache.coyote.ProtocolHandler;
 import org.apache.coyote.http2.Http2Protocol;
+import org.apache.tomcat.util.modeler.Registry;
 import org.apache.tomcat.util.scan.StandardJarScanFilter;
 
 import org.springframework.boot.util.LambdaSafe;
@@ -133,6 +134,8 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
 
 	private int backgroundProcessorDelay;
 
+	private boolean disableMBeanRegistry = true;
+
 	/**
 	 * Create a new {@link TomcatServletWebServerFactory} instance.
 	 */
@@ -167,6 +170,9 @@ private static List<LifecycleListener> getDefaultLifecycleListeners() {
 
 	@Override
 	public WebServer getWebServer(ServletContextInitializer... initializers) {
+		if (this.disableMBeanRegistry) {
+			Registry.disableRegistry();
+		}
 		Tomcat tomcat = new Tomcat();
 		File baseDir = (this.baseDirectory != null) ? this.baseDirectory
 				: createTempDir("tomcat");
@@ -707,6 +713,16 @@ public void setBackgroundProcessorDelay(int delay) {
 		this.backgroundProcessorDelay = delay;
 	}
 
+	/**
+	 * Set whether the factory should disable Tomcat's MBean registry prior to creating
+	 * the server.
+	 * @param disableMBeanRegistry whether to disable the MBean registry
+	 * @since 2.2.0
+	 */
+	public void setDisableMBeanRegistry(boolean disableMBeanRegistry) {
+		this.disableMBeanRegistry = disableMBeanRegistry;
+	}
+
 	/**
 	 * {@link LifecycleListener} to disable persistence in the {@link StandardManager}. A
 	 * {@link LifecycleListener} is used so not to interfere with Tomcat's default manager