X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FKernelUtils.java;h=db33ff9d407bb2fcdbb0ae3cd470954ba6732753;hb=01da06d541cdb4ad614579a37be64b5de900bc20;hp=3797eb913ca05544d5f7c6042d89f2c7227c35a1;hpb=6bfcb81dd21d8fdd9094610c00f5f8ad9c6a36a7;p=lgpl%2Fargeo-commons.git

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 3797eb913..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
@@ -96,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;