X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.e4%2Fsrc%2Forg%2Fargeo%2Fcms%2Fe4%2Fhandlers%2FLocaleAddon.java;h=8582f60b3bbdefea19e2b5af9a1bd9d8492f864e;hb=453b971b83adf490d9f9ef2c0c30d5e48b5d8f94;hp=e1a2581dc27052c6f0e58f7730df64245e3c942b;hpb=73d30af8f72acd35da538765db4dc2d84cd70841;p=lgpl%2Fargeo-commons.git

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 e1a2581dc..8582f60b3 100644
--- 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);
+		}
 	}
 }