Merge tag 'v2.3.28' into testing

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / runtime / KernelUtils.java

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 b35b4be09311b8392531f1fe2e6ae306bc88adf9..db33ff9d407bb2fcdbb0ae3cd470954ba6732753 100644 (file)
--- 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;