Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-22 13:15:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #194 from alangy98/development

Browse Source 
bugfix: port bind error when falling back to http server
This commit is contained in:
Melledy 2022-04-24 09:03:25 -07:00 committed by GitHub
commit bfefb2a022
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
View File

@ -200,8 +200,6 @@ public final class DispatchServer {
public void start() throws Exception {
HttpServer server;
if (Grasscutter.getConfig().getDispatchOptions().UseSSL) {
HttpsServer httpsServer = HttpsServer.create(getAddress(), 0);
SSLContext sslContext = SSLContext.getInstance("TLS");
try (FileInputStream fis = new FileInputStream(Grasscutter.getConfig().getDispatchOptions().KeystorePath)) {
char[] keystorePassword = Grasscutter.getConfig().getDispatchOptions().KeystorePassword.toCharArray();
KeyManagerFactory _kmf;
@ -234,9 +232,9 @@ public final class DispatchServer {
throw originalEx;
}
}
SSLContext sslContext = SSLContext.getInstance("TLS");
sslContext.init(_kmf.getKeyManagers(), null, null);
HttpsServer httpsServer = HttpsServer.create(getAddress(), 0);
httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
server = httpsServer;
} catch (BindException ignored) {