Skip to content

Commit 4c29a8c

Browse files
committed
Fix NPE in NettyWebServer stop
Fixes gh-9542
1 parent 9dfa6a8 commit 4c29a8c

File tree

2 files changed

+38
-1
lines changed

2 files changed

+38
-1
lines changed

Diff for: spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyWebServer.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ public void stop() throws WebServerException {
110110
if (context != null) {
111111
context.dispose();
112112
}
113-
this.latch.countDown();
113+
if (this.latch != null) {
114+
this.latch.countDown();
115+
}
114116
}
115117

116118
@Override
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright 2012-2017 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.springframework.boot.web.embedded.netty;
18+
19+
import org.junit.Test;
20+
21+
/**
22+
* Tests for {@link NettyWebServer}.
23+
*
24+
* @author Madhura Bhave
25+
*/
26+
public class NettyWebServerTests {
27+
28+
private NettyWebServer server;
29+
30+
@Test
31+
public void stopWhenLatchIsNullShouldNotThrowException() throws Exception {
32+
this.server = new NettyWebServer(null, null);
33+
this.server.stop();
34+
}
35+
}

0 commit comments

Comments
 (0)