From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 11 Aug 2022 06:49:50 +0000 (+0200)
Subject: Make empty start up more robust
X-Git-Tag: v2.3.10~66
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=2f6eab782e1f78c6da207fb61b0cb1c9804d759f

Make empty start up more robust
---

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 b76ca5792..cb806444f 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
@@ -149,9 +149,10 @@ public class CmsStateImpl implements CmsState {
 				log.debug("## CMS starting... (" + uuid + ")\n" + sb + "\n");
 			}
 
-			Path nodeBase = getDataPath(KernelConstants.DIR_PRIVATE);
-			if (nodeBase != null && !Files.exists(nodeBase)) {// first init
+			Path privateBase = getDataPath(KernelConstants.DIR_PRIVATE);
+			if (privateBase != null && !Files.exists(privateBase)) {// first init
 				firstInit();
+				Files.createDirectories(privateBase);
 			}
 
 		} catch (RuntimeException | IOException e) {
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelUtils.java
index 295578f53..716596648 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/KernelUtils.java
@@ -55,11 +55,11 @@ class KernelUtils implements KernelConstants {
 		Path executionDir = Paths.get(getFrameworkProp("user.dir"));
 		if (relativePath == null)
 			return executionDir;
-		try {
-			return executionDir.resolve(relativePath).toRealPath();
-		} catch (IOException e) {
-			throw new IllegalArgumentException("Cannot get canonical file", e);
-		}
+//		try {
+		return executionDir.resolve(relativePath);
+//		} catch (IOException e) {
+//			throw new IllegalArgumentException("Cannot get canonical file", e);
+//		}
 	}
 
 //	static File getOsgiInstanceDir() {