Improve login and HTTPS config.

[lgpl/argeo-commons.git] / org.argeo.security.ui.rap / src / org / argeo / security / ui / rap / RapWorkbenchLogin.java

diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapWorkbenchLogin.java b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapWorkbenchLogin.java
index 1f4914ace3591246cb5315282b27313523bce893..8c380bd3ed991d38aec307f737b7f851fb777dc0 100644 (file)
--- a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapWorkbenchLogin.java
+++ b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/RapWorkbenchLogin.java
@@ -6,6 +6,8 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.PlatformUI;
 
 public class RapWorkbenchLogin extends WorkbenchLogin {
+       // private final static Log log =
+       // LogFactory.getLog(RapWorkbenchLogin.class);
 
        @Override
        protected int createAndRunWorkbench(Display display, String username) {
@@ -22,8 +24,13 @@ public class RapWorkbenchLogin extends WorkbenchLogin {
        public int createUI() {
                JavaScriptExecutor jsExecutor = RWT.getClient().getService(
                                JavaScriptExecutor.class);
-               int returnCode = super.createUI();
-               jsExecutor.execute("location.reload()");
+               int returnCode;
+               try {
+                       returnCode = super.createUI();
+               } finally {
+                       // always reload
+                       jsExecutor.execute("location.reload()");
+               }
                return returnCode;
        }