Make E4 more robust

[lgpl/argeo-commons.git] / org.argeo.cms.e4 / src / org / argeo / cms / e4 / handlers / LocaleAddon.java

diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/LocaleAddon.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/LocaleAddon.java
index e1a2581dc27052c6f0e58f7730df64245e3c942b..8582f60b3bbdefea19e2b5af9a1bd9d8492f864e 100644 (file)
--- a/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/LocaleAddon.java
+++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/LocaleAddon.java
@@ -2,6 +2,7 @@ package org.argeo.cms.e4.handlers;
 
 import java.security.AccessController;
 import java.util.Locale;
+import java.util.Set;
 
 import javax.annotation.PostConstruct;
 import javax.security.auth.Subject;
@@ -13,8 +14,11 @@ public class LocaleAddon {
        @PostConstruct
        public void init(ILocaleChangeService localeChangeService) {
                Subject subject = Subject.getSubject(AccessController.getContext());
-               Locale locale = subject.getPublicCredentials(Locale.class).iterator().next();
-               localeChangeService.changeApplicationLocale(locale);
-               UiContext.setLocale(locale);
+               Set<Locale> locales = subject.getPublicCredentials(Locale.class);
+               if (!locales.isEmpty()) {
+                       Locale locale = locales.iterator().next();
+                       localeChangeService.changeApplicationLocale(locale);
+                       UiContext.setLocale(locale);
+               }
        }
 }