Merge branch '2.0.x'

This commit is contained in:
Phillip Webb 2018-10-04 10:17:29 -07:00
commit 546bd89f2e

View File

@ -227,14 +227,14 @@ public class ReactiveWebServerApplicationContext
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();
}