projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor CMS UUID factory
[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 3797eb913ca05544d5f7c6042d89f2c7227c35a1..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
@@
-96,9
+96,8
@@
class KernelUtils implements KernelConstants {
static String getFrameworkProp(String key, String def) {
String value;
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;
value = System.getProperty(key);
if (value == null)
return def;