X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2FPage.java;h=f2bdbd7f7c370951ccfd02cfc9776ec3f6c86833;hb=8001109c6943f8a7a82a81322dd056c74d2b063f;hp=0bd02f789f115022277cd02391f41e676970b1c3;hpb=e409ba881965634f63f0b67824bc93dda4ec4327;p=gigi.git diff --git a/src/org/cacert/gigi/pages/Page.java b/src/org/cacert/gigi/pages/Page.java index 0bd02f78..f2bdbd7f 100644 --- a/src/org/cacert/gigi/pages/Page.java +++ b/src/org/cacert/gigi/pages/Page.java @@ -102,30 +102,29 @@ public abstract class Page implements PermissionCheckable { return title; } - public void setTitle(String title) { - this.title = title; - } - public static Language getLanguage(ServletRequest req) { HttpSession session = ((HttpServletRequest) req).getSession(); - Locale sessval = (Locale) session.getAttribute(Language.SESSION_ATTRIB_NAME); - if (sessval != null) { - Language l = Language.getInstance(sessval); - if (l != null) { - return l; + synchronized (session) { + + Locale sessval = (Locale) session.getAttribute(Language.SESSION_ATTRIB_NAME); + if (sessval != null) { + Language l = Language.getInstance(sessval); + if (l != null) { + return l; + } } - } - Enumeration langs = req.getLocales(); - while (langs.hasMoreElements()) { - Locale c = langs.nextElement(); - Language l = Language.getInstance(c); - if (l != null) { - session.setAttribute(Language.SESSION_ATTRIB_NAME, l.getLocale()); - return l; + Enumeration langs = req.getLocales(); + while (langs.hasMoreElements()) { + Locale c = langs.nextElement(); + Language l = Language.getInstance(c); + if (l != null) { + session.setAttribute(Language.SESSION_ATTRIB_NAME, l.getLocale()); + return l; + } } + session.setAttribute(Language.SESSION_ATTRIB_NAME, Locale.ENGLISH); + return Language.getInstance(Locale.ENGLISH); } - session.setAttribute(Language.SESSION_ATTRIB_NAME, Locale.ENGLISH); - return Language.getInstance(Locale.ENGLISH); } public static String translate(ServletRequest req, String string) {