Fix NPE in NettyWebServer stop

Fixes gh-9542
This commit is contained in:
Madhura Bhave
2017-06-23 15:30:23 -07:00
parent 9dfa6a8f6a
commit 4c29a8cfa2
2 changed files with 38 additions and 1 deletions

View File

@@ -110,7 +110,9 @@ public class NettyWebServer implements WebServer {
if (context != null) {
context.dispose();
}
this.latch.countDown();
if (this.latch != null) {
this.latch.countDown();
}
}
@Override

View File

@@ -0,0 +1,35 @@
/*
* Copyright 2012-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.web.embedded.netty;
import org.junit.Test;
/**
* Tests for {@link NettyWebServer}.
*
* @author Madhura Bhave
*/
public class NettyWebServerTests {
private NettyWebServer server;
@Test
public void stopWhenLatchIsNullShouldNotThrowException() throws Exception {
this.server = new NettyWebServer(null, null);
this.server.stop();
}
}