From 298da4d938c415e7c66f98989cba2fa8b5a81df5 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 5 Mar 2024 16:17:16 +0100
Subject: [PATCH] Use OSGi framework UUID as CMS State UUID

---
 .../src/org/argeo/cms/internal/runtime/CmsStateImpl.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 6fe8dcb7b..ee7f06340 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
@@ -111,7 +111,8 @@ public class CmsStateImpl implements CmsState {
 			if (log.isTraceEnabled())
 				log.trace("CMS State started");
 
-			this.uuid = uuidFactory.timeUUID();
+			String frameworkUuid = KernelUtils.getFrameworkProp(KernelUtils.OSGI_FRAMEWORK_UUID);
+			this.uuid = frameworkUuid != null ? UUID.fromString(frameworkUuid) : uuidFactory.timeUUID();
 
 			// hostname
 			this.hostname = getDeployProperty(CmsDeployProperty.HOST);
-- 
2.30.2