X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.eclipse.ui.rap%2Fsrc%2Forg%2Fargeo%2Feclipse%2Fui%2Fspecific%2FUiContext.java;h=ec3b2e96a62eb18cd162a25b167625223e03e984;hb=c149774fa220fe69f430f7b230ac4c442ea6d0fe;hp=82b60612404b565875b3faeb51e0dc77bf810b2b;hpb=ad9eb24753d1486113cfbc19d8080f15ce5ff68a;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UiContext.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UiContext.java
index 82b606124..ec3b2e96a 100644
--- a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UiContext.java
+++ b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/UiContext.java
@@ -9,17 +9,23 @@ import org.eclipse.swt.widgets.Display;
 
 /** Singleton class providing single sources infos about the UI context. */
 public class UiContext {
-
+	/** Can be null, thus indicating that we are not in a web context. */
 	public static HttpServletRequest getHttpRequest() {
 		return RWT.getRequest();
 	}
 
 	public static Locale getLocale() {
-		return RWT.getUISession().getLocale();
+		if (Display.getCurrent() != null)
+			return RWT.getUISession().getLocale();
+		else
+			return Locale.getDefault();
 	}
 
 	public static void setLocale(Locale locale) {
-		RWT.getUISession().setLocale(locale);
+		if (Display.getCurrent() != null)
+			RWT.getUISession().setLocale(locale);
+		else
+			Locale.setDefault(locale);
 	}
 
 	/** Can always be null */