Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add some cleanup to help avoid exceptions on /reload and shutdown/disable

Browse source
This commit is contained in:
Mike Primm 2011-06-29 01:37:09 -05:00
parent faceab68f1
commit e2b55c3b54
2 changed files with 32 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/org/dynmap/web/HttpServer.java
View file

@ -45,13 +45,15 @@ public class HttpServer extends Thread {
public void run() {
try {
ServerSocket s = sock;
while (listeningThread == Thread.currentThread()) {
try {
Socket socket = sock.accept();
Socket socket = s.accept();
HttpServerConnection requestThread = new HttpServerConnection(socket, this);
requestThread.start();
} catch (IOException e) {
Log.info("map WebServer.run() stops with IOException");
if(listeningThread != null) /* Only report this if we didn't initiate the shutdown */
Log.info("map WebServer.run() stops with IOException");
break;
}
}
@ -63,13 +65,14 @@ public class HttpServer extends Thread {
public void shutdown() {
Log.info("Shutting down webserver...");
listeningThread = null;
try {
if (sock != null) {
sock.close();
sock = null;
}
} catch (IOException e) {
Log.warning("Exception while closing socket for webserver shutdown", e);
}
listeningThread = null;
}
}