Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
4c29a8cf
Commit
4c29a8cf
authored
Jun 23, 2017
by
Madhura Bhave
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix NPE in NettyWebServer stop
Fixes gh-9542
parent
9dfa6a8f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
1 deletion
+38
-1
NettyWebServer.java
...ringframework/boot/web/embedded/netty/NettyWebServer.java
+3
-1
NettyWebServerTests.java
...ramework/boot/web/embedded/netty/NettyWebServerTests.java
+35
-0
No files found.
spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyWebServer.java
View file @
4c29a8cf
...
@@ -110,7 +110,9 @@ public class NettyWebServer implements WebServer {
...
@@ -110,7 +110,9 @@ public class NettyWebServer implements WebServer {
if
(
context
!=
null
)
{
if
(
context
!=
null
)
{
context
.
dispose
();
context
.
dispose
();
}
}
this
.
latch
.
countDown
();
if
(
this
.
latch
!=
null
)
{
this
.
latch
.
countDown
();
}
}
}
@Override
@Override
...
...
spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyWebServerTests.java
0 → 100644
View file @
4c29a8cf
/*
* 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
();
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment