From b2cc7030cc88b71cf8ba1fc808b13428fe9db8ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Tue, 16 Aug 2016 10:07:04 +0200 Subject: [PATCH] fix: use default language instead of crashing with NPE. Change-Id: Ie3be2742607bc93d18c38480b85b960f1153b5c0 --- src/org/cacert/gigi/Gigi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 1c503666..1108aa04 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -372,7 +372,7 @@ public final class Gigi extends HttpServlet { if (req.getParameter("lang") != null) { Locale l = Language.getLocaleFromString(req.getParameter("lang")); Language lu = Language.getInstance(l); - req.getSession().setAttribute(Language.SESSION_ATTRIB_NAME, lu.getLocale()); + req.getSession().setAttribute(Language.SESSION_ATTRIB_NAME, lu != null ? lu.getLocale() : Locale.ENGLISH); } final Page p = getPage(req.getPathInfo()); -- 2.39.2