From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 8 May 2024 07:00:57 +0000 (+0200)
Subject: Janitor thread per instance
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=refs%2Fheads%2Funstable

Janitor thread per instance
---

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 d123aa0..851d686 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
@@ -95,7 +95,9 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber
 //	private CmsUserManager cmsUserManager;
 
 	// TODO make more optimal or via CmsSession/CmsView
-	private static Timer janitorTimer = new Timer(true);
+	// It works if static, but there is no clean way to get rid of it, so we open
+	// one per app
+	private Timer janitorTimer = new Timer(true);
 	private Map<String, WeakReference<SwtAppUi>> managedUis = new HashMap<>();
 
 	// ACR
@@ -189,6 +191,8 @@ public class SwtArgeoApp extends AbstractArgeoApp implements CmsEventSubscriber
 		if (log.isDebugEnabled())
 			log.info("Argeo Suite App stopped");
 
+		// clean janitor timer so that th thread is not kept
+		janitorTimer.cancel();
 	}
 
 	@Override