X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fdialogs%2FAbstractLoginDialog.java;h=5c83066ee007ea01a1a8182bb96f10e081a189fb;hb=6bb0606505be3e99021c5ff9771c719eb1e1f2e7;hp=92ca3d85de5aabe190cfb6720f6f87b82e2355f4;hpb=528580a33f630f79c61caa1378b581cc13b2b8ed;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java
index 92ca3d85d..5c83066ee 100644
--- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java
+++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/AbstractLoginDialog.java
@@ -79,6 +79,7 @@ public abstract class AbstractLoginDialog extends TrayDialog implements
 				isCancelled = false;
 				setBlockOnOpen(false);
 				open();
+
 				final Button okButton = getButton(IDialogConstants.OK_ID);
 				okButton.setText("Login");
 				okButton.addSelectionListener(new SelectionListener() {
@@ -124,10 +125,10 @@ public abstract class AbstractLoginDialog extends TrayDialog implements
 						// when the OSGi runtime is shut down
 						try {
 							Thread.sleep(100);
-							if (display.isDisposed()) {
-								log.warn("Display is disposed, killing login dialog thread");
-								throw new ThreadDeath();
-							}
+							// if (display.isDisposed()) {
+							// log.warn("Display is disposed, killing login dialog thread");
+							// throw new ThreadDeath();
+							// }
 						} catch (final Exception e) {
 							// do nothing
 						}
@@ -147,6 +148,7 @@ public abstract class AbstractLoginDialog extends TrayDialog implements
 			}, true, new NullProgressMonitor(), Display.getDefault());
 		} catch (ThreadDeath e) {
 			isCancelled = true;
+			log.debug("Thread " + Thread.currentThread().getId() + " died");
 			throw e;
 		} catch (Exception e) {
 			isCancelled = true;
@@ -157,18 +159,18 @@ public abstract class AbstractLoginDialog extends TrayDialog implements
 		} finally {
 			// so that the modal thread dies
 			processCallbacks = true;
-			try {
-				// wait for the modal context thread to gracefully exit
-				modalContextThread.join(1000);
-			} catch (InterruptedException ie) {
-				// silent
-			}
+			// try {
+			// // wait for the modal context thread to gracefully exit
+			// modalContextThread.join();
+			// } catch (InterruptedException ie) {
+			// // silent
+			// }
 			modalContextThread = null;
 		}
 	}
 
 	protected void configureShell(Shell shell) {
 		super.configureShell(shell);
-		shell.setText("Login");
+		shell.setText("Authentication");
 	}
 }