From 40cf40ce007f07f5f3f0bafea42e1af7b935692b Mon Sep 17 00:00:00 2001
From: memetrollsXD <paris@memetrolls.net>
Date: Sun, 24 Apr 2022 04:50:22 +0200
Subject: [PATCH] Remove last catch and init another variable as placeholder

---
 .../emu/grasscutter/server/dispatch/DispatchServer.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
index deb4faae3a0..2d36b224e7d 100644
--- a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
@@ -177,11 +177,12 @@ public void start() throws Exception {
 			SSLContext sslContext = SSLContext.getInstance("TLS");
 			try (FileInputStream fis = new FileInputStream(Grasscutter.getConfig().getDispatchOptions().KeystorePath)) {
 				char[] keystorePassword = Grasscutter.getConfig().getDispatchOptions().KeystorePassword.toCharArray();
-
+				KeyManagerFactory _kmf;
 				try {
 					KeyStore ks = KeyStore.getInstance("PKCS12");
 					ks.load(fis, keystorePassword);
 					KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+					_kmf = kmf;
 					kmf.init(ks, keystorePassword);
 				} catch (Exception e) {
 					Grasscutter.getLogger().warn("[Dispatch] Unable to load keystore. Using default keystore password...");
@@ -189,11 +190,10 @@ public void start() throws Exception {
 					ks.load(fis, "123456".toCharArray());
 					KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
 					kmf.init(ks, "123456".toCharArray());
-				} catch (Exception e) {
-					Grasscutter.getLogger().warn("[Dispatch] Error while loading keystore!");
+					_kmf = kmf;
 				}
 				
-				sslContext.init(kmf.getKeyManagers(), null, null);
+				sslContext.init(_kmf.getKeyManagers(), null, null);
 				
 				httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
 				server = httpsServer;