dorkbox/Network
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed channel shutdown order

Browse Source
This commit is contained in:
nathan 2018-02-14 20:33:52 +01:00
parent b26e01cc3d
commit 803f9c5fdb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/dorkbox/network/connection/Shutdownable.java
View File

@ -148,7 +148,7 @@ class Shutdownable {
// server only does this on stop. Client does this on closeConnections
void shutdownChannels() {
synchronized (shutdownChannelList) {
// now we stop all of our channels
// now we stop all of our channels. For the server, this will close the server manager for UDP sessions
for (ChannelFuture f : shutdownChannelList) {
Channel channel = f.channel();
if (channel.isOpen()) {
@ -275,6 +275,9 @@ class Shutdownable {
// make sure we are not trying to stop during a startup procedure.
// This will wait until we have finished starting up/shutting down.
synchronized (shutdownInProgress) {
shutdownChannelsPre();
shutdownChannels();
// we want to WAIT until after the event executors have completed shutting down.
List<Future<?>> shutdownThreadList = new LinkedList<Future<?>>();
@ -298,9 +301,7 @@ class Shutdownable {
Thread.yield();
}
shutdownChannelsPre();
shutdownChannels();
logger.info("Stopping endpoint.");