X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsStateImpl.java;h=ee7f06340d521a76642c0bd9424436c4244e3629;hb=298da4d938c415e7c66f98989cba2fa8b5a81df5;hp=6fe8dcb7b2b5a175eec5141ec16674b8dbff34c9;hpb=a9b4ba6cd79a32b092e24ebfa907ecf90f0cf938;p=lgpl%2Fargeo-commons.git

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);