Make data paths more robust

[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 5635bccfed34a9e5dff34999b84430ce267c6b7d..0e84af62af45d8c5b2d22b0261cb3e1dcc2170b9 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
@@ -19,7 +19,7 @@ import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.internal.osgi.CmsActivator;
 
 /** Package utilities */
-public class KernelUtils implements KernelConstants {
+class KernelUtils implements KernelConstants {
        final static String OSGI_INSTANCE_AREA = "osgi.instance.area";
        final static String OSGI_CONFIGURATION_AREA = "osgi.configuration.area";
 
@@ -74,6 +74,8 @@ public class KernelUtils implements KernelConstants {
 
        public static URI getOsgiInstanceUri(String relativePath) {
                String osgiInstanceBaseUri = getFrameworkProp(OSGI_INSTANCE_AREA);
+               if (!osgiInstanceBaseUri.endsWith("/"))
+                       osgiInstanceBaseUri = osgiInstanceBaseUri + "/";
                if (osgiInstanceBaseUri != null)
                        return safeUri(osgiInstanceBaseUri + (relativePath != null ? relativePath : ""));
                else