From 6dead7e5168ecbc56fd52c6af24521d01425a113 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sat, 21 Feb 2015 01:27:06 +0100 Subject: [PATCH] Fix: Always synchronize Language access. --- .../cacert/gigi/localisation/Language.java | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/src/org/cacert/gigi/localisation/Language.java b/src/org/cacert/gigi/localisation/Language.java index 6a48f5aa..95971120 100644 --- a/src/org/cacert/gigi/localisation/Language.java +++ b/src/org/cacert/gigi/localisation/Language.java @@ -112,26 +112,23 @@ public class Language { if ( !file.exists()) { return null; } - Language lang = langs.get(locale.toString()); - if (lang == null) { - synchronized (Language.class) { - lang = langs.get(locale.toString()); - if (lang != null) { - return lang; - } - try { - lang = new Language(locale); - langs.put(locale.toString(), lang); - } catch (ParserConfigurationException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } catch (SAXException e) { - e.printStackTrace(); - } + synchronized (Language.class) { + Language lang = langs.get(locale.toString()); + if (lang != null) { + return lang; + } + try { + lang = new Language(locale); + langs.put(locale.toString(), lang); + } catch (ParserConfigurationException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } catch (SAXException e) { + e.printStackTrace(); } + return lang; } - return lang; } public Locale getLocale() { -- 2.39.2