Fix regression in RCP introduced by resolution of

https://www.argeo.org/bugzilla/show_bug.cgi?id=161

git-svn-id: https://svn.argeo.org/commons/branches/1.x@6402 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java
index b6bab756b653a0d8beaa18fd0d4c3791a12a69c0..03584185bf06ad73193068ec1b2d717543262459 100644 (file)
--- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java
+++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/SecurityUiPlugin.java
@@ -85,7 +85,10 @@ public class SecurityUiPlugin extends AbstractUIPlugin {
                                UnsupportedCallbackException {
 
                        // if (display != null) // RCP
-                       display.get().syncExec(new Runnable() {
+                       Display displayToUse = display.get();
+                       if (displayToUse == null)// RCP
+                               displayToUse = Display.getDefault();
+                       displayToUse.syncExec(new Runnable() {
                                public void run() {
                                        DefaultLoginDialog dialog = new DefaultLoginDialog(display
                                                        .get().getActiveShell());