X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=swt%2Frap%2Forg.argeo.cms.swt.rap%2Fsrc%2Forg%2Fargeo%2Fcms%2Fweb%2FCmsWebEntryPoint.java;h=02e5da3666edd040753a53d34a1331165cac96ad;hb=HEAD;hp=2389755432e6ccc6b381543f2cbab3a3fe45cd37;hpb=4086635cfaa04c8a184124048794398b0ba96a55;p=lgpl%2Fargeo-commons.git diff --git a/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java index 238975543..02e5da366 100644 --- a/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java +++ b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java @@ -276,7 +276,9 @@ public class CmsWebEntryPoint extends AbstractSwtCmsView implements EntryPoint, Subject.doAs(loginContext.getSubject(), new PrivilegedAction() { @Override public Void run() { + // TODO rather loop here, until there is an auth change if (!display.readAndDispatch()) { + // TODO update UI last access here display.sleep(); } return null; @@ -285,7 +287,8 @@ public class CmsWebEntryPoint extends AbstractSwtCmsView implements EntryPoint, } catch (SWTError e) { SWTError swtError = (SWTError) e; if (swtError.code == SWT.ERROR_FUNCTION_DISPOSED) { - log.error("Unexpected SWT error in event loop, ignoring it. " + e.getMessage()); + if (log.isTraceEnabled()) + log.error("Unexpected SWT error in event loop, ignoring it. " + e.getMessage()); continue eventLoop; } else { log.error("Unexpected SWT error in event loop, shutting down...", e); @@ -302,6 +305,8 @@ public class CmsWebEntryPoint extends AbstractSwtCmsView implements EntryPoint, continue eventLoop; } } + if (serverPushSession != null) + serverPushSession.stop(); if (!display.isDisposed()) display.dispose(); }