From f8c860686196eb83392d53c0e04c6bf5534e1879 Mon Sep 17 00:00:00 2001 From: adler <1101635162@qq.com> Date: Sat, 3 Apr 2021 00:11:32 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/b3log/solo/SoloServletListener.java | 12 ++++++++---- .../java/org/b3log/solo/service/CronMgmtService.java | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/b3log/solo/SoloServletListener.java b/src/main/java/org/b3log/solo/SoloServletListener.java index f038561b..618541b5 100644 --- a/src/main/java/org/b3log/solo/SoloServletListener.java +++ b/src/main/java/org/b3log/solo/SoloServletListener.java @@ -50,6 +50,7 @@ import org.b3log.solo.util.Markdowns; import org.b3log.solo.util.Skins; import org.b3log.solo.util.Solos; +import org.json.JSONException; import org.json.JSONObject; import javax.servlet.ServletContextEvent; @@ -166,10 +167,13 @@ public void contextInitialized(final ServletContextEvent servletContextEvent) { WAF.set(); new Thread(KanBanNiangProcessor::downloadKBNResource).start(); - final OptionQueryService optionQueryService = beanManager.getReference(OptionQueryService.class); - final JSONObject preference = optionQueryService.getPreference(); - final String localeString = preference.getString(Option.ID_C_LOCALE_STRING); - Latkes.setLocale(new Locale(Locales.getLanguage(localeString), Locales.getCountry(localeString))); + try { + final OptionQueryService optionQueryService = beanManager.getReference(OptionQueryService.class); + final JSONObject preference = optionQueryService.getPreference(); + final String localeString = preference.getString(Option.ID_C_LOCALE_STRING); + Latkes.setLocale(new Locale(Locales.getLanguage(localeString), Locales.getCountry(localeString))); + } catch (JSONException ignored) { + } } @Override diff --git a/src/main/java/org/b3log/solo/service/CronMgmtService.java b/src/main/java/org/b3log/solo/service/CronMgmtService.java index 994fa8f2..99cd65e1 100644 --- a/src/main/java/org/b3log/solo/service/CronMgmtService.java +++ b/src/main/java/org/b3log/solo/service/CronMgmtService.java @@ -23,6 +23,7 @@ import org.b3log.latke.service.annotation.Service; import org.b3log.latke.util.Stopwatchs; import org.b3log.solo.model.Option; +import org.json.JSONException; import org.json.JSONObject; import java.util.concurrent.Executors; @@ -104,7 +105,7 @@ public void start() { try { enableAutoFlushGitHub = preference.getBoolean(Option.ID_C_ENABLE_AUTO_FLUSH_GITHUB); myGitHubID = preference.getString(Option.ID_C_MY_GITHUB_ID); - } catch (NullPointerException e) { + } catch (NullPointerException | JSONException e) { enableAutoFlushGitHub = false; myGitHubID = ""; }