]> WPIA git - gigi.git/commitdiff
fix: use default language instead of crashing with NPE.
authorFelix Dörre <felix@dogcraft.de>
Tue, 16 Aug 2016 08:07:04 +0000 (10:07 +0200)
committerFelix Dörre <felix@dogcraft.de>
Tue, 16 Aug 2016 08:07:04 +0000 (10:07 +0200)
Change-Id: Ie3be2742607bc93d18c38480b85b960f1153b5c0

src/org/cacert/gigi/Gigi.java

index 1c503666e338547faf69a208843d1fafbdea1a06..1108aa04bf26ff2fd40b30b70fc05caba37b2cd8 100644 (file)
@@ -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());