Fix Reactive...Context NPE

Fix possible NPE in `ReactiveWebServerApplicationContext`. See spring-projectsgh-14666
liuxuehai · Oct 4, 2018 · 2b6bdfe · 2b6bdfe
1 parent 1774a28
commit 2b6bdfe
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...va/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java b/...va/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java
@@ -227,14 +227,14 @@ public static WebServer getWebServer(ServerManager manager) {
 
 		public static void start(ServerManager manager,
 				Supplier<HttpHandler> handlerSupplier) {
-			if (manager != null) {
+			if (manager != null && manager.server != null) {
 				manager.handler = handlerSupplier.get();
 				manager.server.start();
 			}
 		}
 
 		public static void stop(ServerManager manager) {
-			if (manager != null) {
+			if (manager != null && manager.server != null) {
 				try {
 					manager.server.stop();
 				}