From: Mathieu <mbaudier@argeo.org>
Date: Mon, 12 Dec 2022 04:39:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.109~1
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=7f18787b6f6ab9087cd2623fff484d7c2432351d;hp=278a19464a0ed390d47fd01042dd31fac16a7f1d;p=lgpl%2Fargeo-commons.git

Merge remote-tracking branch 'origin/unstable' into testing
---

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
index 5c3838a0a..d364620f5 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
@@ -91,19 +91,21 @@ public class CmsStateImpl implements CmsState {
 	}
 
 	public void start() {
-//		Runtime.getRuntime().addShutdownHook(new CmsShutdown());
-
 		try {
+			// First init check
+			Path privateBase = getDataPath(KernelConstants.DIR_PRIVATE);
+			if (privateBase != null && !Files.exists(privateBase)) {// first init
+				firstInit();
+				Files.createDirectories(privateBase);
+			}
+
 			initSecurity();
 //			initArgeoLogger();
 
 			if (log.isTraceEnabled())
 				log.trace("CMS State started");
 
-//			String stateUuidStr = KernelUtils.getFrameworkProp(Constants.FRAMEWORK_UUID);
-//			this.uuid = UUID.fromString(stateUuidStr);
 			this.uuid = uuidFactory.timeUUID();
-//		this.cleanState = stateUuid.equals(frameworkUuid);
 
 			// hostname
 			this.hostname = getDeployProperty(CmsDeployProperty.HOST);
@@ -149,12 +151,6 @@ public class CmsStateImpl implements CmsState {
 				log.debug("## CMS starting... (" + uuid + ")\n" + sb + "\n");
 			}
 
-			Path privateBase = getDataPath(KernelConstants.DIR_PRIVATE);
-			if (privateBase != null && !Files.exists(privateBase)) {// first init
-				firstInit();
-				Files.createDirectories(privateBase);
-			}
-
 		} catch (RuntimeException | IOException e) {
 			log.error("## FATAL: CMS state failed", e);
 		}
@@ -162,7 +158,7 @@ public class CmsStateImpl implements CmsState {
 
 	private void initSecurity() {
 		// private directory permissions
-		Path privateDir = KernelUtils.getOsgiInstancePath(KernelConstants.DIR_PRIVATE);
+		Path privateDir = getDataPath(KernelConstants.DIR_PRIVATE);
 		if (privateDir != null) {
 			// TODO rather check whether we can read and write
 			Set<PosixFilePermission> posixPermissions = new HashSet<>();
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 70f49f670..4d91cf8e2 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
@@ -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;