Merge '3.6.0'

This commit is contained in:
Fuzzlemann 2017-07-29 22:38:17 +02:00
parent e76e3d0f52
commit f25c348870

View File

@ -63,7 +63,6 @@ public class WebServer {
if (enabled) {
return;
}
Log.info(Phrase.WEBSERVER_INIT.toString());
try {
usingHttps = startHttpsServer();
@ -113,7 +112,6 @@ public class WebServer {
}
}
});
server.setExecutor(new ThreadPoolExecutor(4, 8, 30, TimeUnit.SECONDS, new ArrayBlockingQueue<>(100)));
server.start();