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

Remove last catch and init another variable as placeholder

Browse Source
This commit is contained in:
memetrollsXD 2022-04-24 04:50:22 +02:00
parent bed3181252
commit 79d646d358
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,11 +177,12 @@ public final class DispatchServer {
SSLContext sslContext = SSLContext.getInstance("TLS"); SSLContext sslContext = SSLContext.getInstance("TLS");
try (FileInputStream fis = new FileInputStream(Grasscutter.getConfig().getDispatchOptions().KeystorePath)) { try (FileInputStream fis = new FileInputStream(Grasscutter.getConfig().getDispatchOptions().KeystorePath)) {
char[] keystorePassword = Grasscutter.getConfig().getDispatchOptions().KeystorePassword.toCharArray(); char[] keystorePassword = Grasscutter.getConfig().getDispatchOptions().KeystorePassword.toCharArray();
KeyManagerFactory _kmf;
try { try {
KeyStore ks = KeyStore.getInstance("PKCS12"); KeyStore ks = KeyStore.getInstance("PKCS12");
ks.load(fis, keystorePassword); ks.load(fis, keystorePassword);
KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
_kmf = kmf;
kmf.init(ks, keystorePassword); kmf.init(ks, keystorePassword);
} catch (Exception e) { } catch (Exception e) {
Grasscutter.getLogger().warn("[Dispatch] Unable to load keystore. Using default keystore password..."); Grasscutter.getLogger().warn("[Dispatch] Unable to load keystore. Using default keystore password...");
@ -189,11 +190,10 @@ public final class DispatchServer {
ks.load(fis, "123456".toCharArray()); ks.load(fis, "123456".toCharArray());
KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509"); KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
kmf.init(ks, "123456".toCharArray()); kmf.init(ks, "123456".toCharArray());
} catch (Exception e) { _kmf = kmf;
Grasscutter.getLogger().warn("[Dispatch] Error while loading keystore!");
} }
sslContext.init(kmf.getKeyManagers(), null, null); sslContext.init(_kmf.getKeyManagers(), null, null);
httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext)); httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
server = httpsServer; server = httpsServer;