X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=swt%2Forg.argeo.app.swt%2Fsrc%2Forg%2Fargeo%2Fapp%2Fswt%2Fux%2FSwtArgeoApp.java;h=505c52d92ebdf52bd65291b30330edff12139fa1;hb=846518809f5f6a2e5c28e851d743ece803d95f6b;hp=ef3bb8c330e1018de0b63c29cafa10124e9662d0;hpb=57af3e86327a40232216d20256eee155de1145aa;p=gpl%2Fargeo-suite.git

diff --git a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtArgeoApp.java b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtArgeoApp.java
index ef3bb8c..505c52d 100644
--- a/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtArgeoApp.java
+++ b/swt/org.argeo.app.swt/src/org/argeo/app/swt/ux/SwtArgeoApp.java
@@ -6,6 +6,7 @@ import java.lang.ref.WeakReference;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -127,28 +128,49 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber
 			// TODO does it make sense to accept that?
 			appPid = "<unknown>";
 		}
-		if (log.isDebugEnabled())
-			log.info("Argeo Suite App " + appPid + " started");
-
 		Objects.requireNonNull(contentRepository, "Content repository must be provided");
 		Objects.requireNonNull(appUserState, "App user state must be provided");
-		
-		long janitorPeriod = 12 * 60 * 60 * 1000;// 12h
+
+		long janitorPeriod = 60 * 60 * 1000;// 1h
 		janitorTimer.schedule(new TimerTask() {
 
 			@Override
 			public void run() {
-				refs: for (WeakReference<SwtAppUi> uiRef : managedUis.values()) {
-					SwtAppUi ui = uiRef.get();
-					if (ui == null)
-						continue refs;
-					ui.disposeIfTimedout();
+				try {
+					Iterator<Map.Entry<String, WeakReference<SwtAppUi>>> uiRefs = managedUis.entrySet().iterator();
+					refs: while (uiRefs.hasNext()) {
+						Map.Entry<String, WeakReference<SwtAppUi>> entry = uiRefs.next();
+						String uiUuid = entry.getKey();
+						WeakReference<SwtAppUi> uiRef = entry.getValue();
+						SwtAppUi ui = uiRef.get();
+						if (ui == null) {
+							if (log.isTraceEnabled())
+								log.warn("Unreferenced UI " + uiUuid + " in " + appPid + ", removing it");
+							uiRefs.remove();
+							continue refs;
+						}
+						if (!ui.isDisposed() && !ui.getDisplay().isDisposed()) {
+							if (ui.isTimedOut()) {
+								if (log.isTraceEnabled())
+									log.trace("Killing timed-out UI " + uiUuid + " in " + appPid);
+								UiContext.killDisplay(ui.getDisplay());
+							}
+						} else {
+							if (log.isTraceEnabled())
+								log.warn("Disposed UI " + uiUuid + " still in " + appPid + ", removing it");
+							uiRefs.remove();
+						}
+					}
+					if (log.isTraceEnabled())
+						log.trace(managedUis.size() + " UIs being managed by app " + appPid);
+				} catch (Exception e) {
+					e.printStackTrace();
 				}
-				if (log.isDebugEnabled())
-					log.debug(managedUis.size() + " UIs being managed by app " + appPid);
 			}
 		}, janitorPeriod, janitorPeriod);
 
+		if (log.isDebugEnabled())
+			log.info("Argeo Suite App " + appPid + " started");
 	}
 
 	public void stop(Map<String, Object> properties) {
@@ -187,7 +209,7 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber
 			CmsSwtUtils.registerCmsTheme(uiParent.getShell(), theme);
 		SwtAppUi argeoSuiteUi = new SwtAppUi(uiParent, SWT.INHERIT_DEFAULT);
 		// TODO make timeout configurable
-		argeoSuiteUi.setUiTimeout(12 * 60 * 60 * 1000);// 12 hours
+		argeoSuiteUi.setUiTimeout(6 * 60 * 60 * 1000);// 6 hours
 		String uid = cmsView.getUid();
 		argeoSuiteUi.addDisposeListener(new CleanUpUi(uid));
 		managedUis.put(uid, new WeakReference<>(argeoSuiteUi));