From 76157c77fa26ae3801a6aab28d722a5df0cd9f6d Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Fri, 22 Aug 2025 11:14:20 +0200 Subject: [PATCH] Improve null-safety of module/spring-boot-web-server See gh-46926 --- .../context/ReactiveWebServerApplicationContext.java | 8 ++++---- .../context/ServletWebServerApplicationContext.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/ReactiveWebServerApplicationContext.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/ReactiveWebServerApplicationContext.java index 3357322db31..096387ff93a 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/ReactiveWebServerApplicationContext.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/reactive/context/ReactiveWebServerApplicationContext.java @@ -102,11 +102,11 @@ public class ReactiveWebServerApplicationContext extends GenericReactiveWebAppli ReactiveWebServerFactory webServerFactory = getWebServerFactory(webServerFactoryBeanName); createWebServer.tag("factory", webServerFactory.getClass().toString()); boolean lazyInit = getBeanFactory().getBeanDefinition(webServerFactoryBeanName).isLazyInit(); - this.serverManager = new WebServerManager(this, webServerFactory, this::getHttpHandler, lazyInit); + serverManager = new WebServerManager(this, webServerFactory, this::getHttpHandler, lazyInit); + this.serverManager = serverManager; getBeanFactory().registerSingleton("webServerGracefulShutdown", - new WebServerGracefulShutdownLifecycle(this.serverManager.getWebServer())); - getBeanFactory().registerSingleton("webServerStartStop", - new WebServerStartStopLifecycle(this.serverManager)); + new WebServerGracefulShutdownLifecycle(serverManager.getWebServer())); + getBeanFactory().registerSingleton("webServerStartStop", new WebServerStartStopLifecycle(serverManager)); createWebServer.end(); } initPropertySources(); diff --git a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletWebServerApplicationContext.java b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletWebServerApplicationContext.java index 87c6290570f..ddda5023638 100644 --- a/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletWebServerApplicationContext.java +++ b/module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/servlet/context/ServletWebServerApplicationContext.java @@ -187,12 +187,12 @@ public class ServletWebServerApplicationContext extends GenericWebApplicationCon StartupStep createWebServer = getApplicationStartup().start("spring.boot.webserver.create"); ServletWebServerFactory factory = getWebServerFactory(); createWebServer.tag("factory", factory.getClass().toString()); - this.webServer = factory.getWebServer(getSelfInitializer()); + webServer = factory.getWebServer(getSelfInitializer()); + this.webServer = webServer; createWebServer.end(); getBeanFactory().registerSingleton("webServerGracefulShutdown", - new WebServerGracefulShutdownLifecycle(this.webServer)); - getBeanFactory().registerSingleton("webServerStartStop", - new WebServerStartStopLifecycle(this, this.webServer)); + new WebServerGracefulShutdownLifecycle(webServer)); + getBeanFactory().registerSingleton("webServerStartStop", new WebServerStartStopLifecycle(this, webServer)); } else if (servletContext != null) { try {