X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FKernelUtils.java;fp=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FKernelUtils.java;h=db33ff9d407bb2fcdbb0ae3cd470954ba6732753;hp=b35b4be09311b8392531f1fe2e6ae306bc88adf9;hb=b95462873703848193e56fcbe997693630db6121;hpb=55d88fba80cec198a0f11ba7545e19878c51fc5e

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 b35b4be09..db33ff9d4 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
@@ -22,6 +22,8 @@ class KernelUtils implements KernelConstants {
 	final static String OSGI_INSTANCE_AREA = "osgi.instance.area";
 	final static String OSGI_CONFIGURATION_AREA = "osgi.configuration.area";
 
+	final static String OSGI_FRAMEWORK_UUID = "org.osgi.framework.uuid";
+
 	static void setJaasConfiguration(URL jaasConfigurationUrl) {
 		try {
 			URIParameter uriParameter = new URIParameter(jaasConfigurationUrl.toURI());
@@ -94,9 +96,8 @@ class KernelUtils implements KernelConstants {
 
 	static String getFrameworkProp(String key, String def) {
 		String value;
-		if (CmsActivator.getBundleContext() != null)
-			value = CmsActivator.getBundleContext().getProperty(key);
-		else
+		value = CmsActivator.getFrameworkProperty(key);
+		if (value == null)
 			value = System.getProperty(key);
 		if (value == null)
 			return def;