From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 9 Sep 2019 05:55:24 +0000 (+0200)
Subject: Make CMS login more robust.
X-Git-Tag: argeo-commons-2.1.79~7
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=4235aef922df6cc651d65f6668a8b0fa800f4e49

Make CMS login more robust.
---

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java b/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java
index 46b3d4f8b..cc0e766d4 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/widgets/auth/CmsLogin.java
@@ -28,6 +28,7 @@ import org.argeo.cms.ui.internal.Activator;
 import org.argeo.cms.util.CmsUtils;
 import org.argeo.eclipse.ui.specific.UiContext;
 import org.argeo.node.NodeConstants;
+import org.argeo.node.NodeState;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
@@ -63,10 +64,15 @@ public class CmsLogin implements CmsStyles, CallbackHandler {
 
 	public CmsLogin(CmsView cmsView) {
 		this.cmsView = cmsView;
-		defaultLocale = Activator.getNodeState().getDefaultLocale();
-		List<Locale> locales = Activator.getNodeState().getLocales();
-		if (locales != null)
-			localeChoice = new LocaleChoice(locales, defaultLocale);
+		NodeState nodeState = Activator.getNodeState();
+		if (nodeState != null) {
+			defaultLocale = nodeState.getDefaultLocale();
+			List<Locale> locales = nodeState.getLocales();
+			if (locales != null)
+				localeChoice = new LocaleChoice(locales, defaultLocale);
+		} else {
+			defaultLocale = Locale.getDefault();
+		}
 		loginSelectionListener = new SelectionListener() {
 			private static final long serialVersionUID = -8832133363830973578L;