Skip to content

Commit 2b6bdfe

Browse files
committed
Fix Reactive...Context NPE
Fix possible NPE in `ReactiveWebServerApplicationContext`. See gh-14666
1 parent 1774a28 commit 2b6bdfe

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,14 @@ public static WebServer getWebServer(ServerManager manager) {
227227

228228
public static void start(ServerManager manager,
229229
Supplier<HttpHandler> handlerSupplier) {
230-
if (manager != null) {
230+
if (manager != null && manager.server != null) {
231231
manager.handler = handlerSupplier.get();
232232
manager.server.start();
233233
}
234234
}
235235

236236
public static void stop(ServerManager manager) {
237-
if (manager != null) {
237+
if (manager != null && manager.server != null) {
238238
try {
239239
manager.server.stop();
240240
}

0 commit comments

Comments
 (0)