From c6768a14469d544ffe2d070da334557f147d30dd Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 13 Apr 2018 18:33:27 +0200
Subject: [PATCH] Make local auth more robust

---
 .../src/org/argeo/cms/auth/UserAdminLoginModule.java         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
index b95d05770..4862c57ac 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
@@ -167,7 +167,10 @@ public class UserAdminLoginModule implements LoginModule {
 
 	@Override
 	public boolean commit() throws LoginException {
-		subject.getPublicCredentials().add(locale);
+		if (locale == null)
+			subject.getPublicCredentials().add(Locale.getDefault());
+		else
+			subject.getPublicCredentials().add(locale);
 
 		if (singleUser) {
 			OsUserUtils.loginAsSystemUser(subject);
-- 
2.30.2