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=70f49f670054b82424104b68793fb1a190feaf30;hb=66a608fecdca2821928b4ae849b9babc195437f3;hp=bb6a2e1035fabcb176e583e584213442503059aa;hpb=257d82f6cab077fa0f58b2c4ad294ab4840155de;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 bb6a2e103..70f49f670 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 @@ -17,8 +17,8 @@ import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.CmsSession; import org.argeo.api.cms.ux.CmsImageManager; import org.argeo.api.cms.ux.CmsView; +import org.argeo.cms.CurrentUser; import org.argeo.cms.LocaleUtils; -import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.auth.RemoteAuthCallbackHandler; import org.argeo.cms.servlet.ServletHttpRequest; import org.argeo.cms.servlet.ServletHttpResponse; @@ -191,7 +191,7 @@ public class CmsWebEntryPoint extends AbstractSwtCmsView implements EntryPoint, }); } - /** Sets the state of the entry point and retrieve the related JCR node. */ + /** Sets the state of the entry point and retrieve the related content. */ protected String setState(String newState) { cmsWebApp.getCmsApp().setState(ui, newState); state = newState; @@ -283,9 +283,9 @@ public class CmsWebEntryPoint extends AbstractSwtCmsView implements EntryPoint, } } else if (e instanceof ThreadDeath) { throw (ThreadDeath) e; - } else if (e instanceof Error) { - log.error("Unexpected error in event loop, shutting down...", e); - break eventLoop; +// } else if (e instanceof Error) { +// log.error("Unexpected error in event loop, shutting down...", e); +// break eventLoop; } else { log.error("Unexpected exception in event loop, ignoring it. " + e.getMessage()); continue eventLoop;