From 6bd449f839949c0ebc7eafdd9c9997dc10850db0 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 28 Nov 2015 18:03:51 +0000 Subject: [PATCH] Fix URI when using default LDIF git-svn-id: https://svn.argeo.org/commons/trunk@8650 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/org/argeo/cms/internal/kernel/NodeUserAdmin.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java index d6d721f6d..2c6fe7de0 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java @@ -290,10 +290,11 @@ public class NodeUserAdmin implements UserAdmin, KernelConstants { if (uri.startsWith("/") || uri.startsWith("./") || uri.startsWith("../")) u = new File(uri).getCanonicalFile().toURI(); - else if (!uri.contains("/")) - u = new File(nodeBaseDir, uri).getCanonicalFile() - .toURI(); - else + else if (!uri.contains("/")) { + u = new URI(nodeBaseDir.toURI()+ uri); + // u = new File(nodeBaseDir, uri).getCanonicalFile() + // .toURI(); + } else throw new CmsException("Cannot interpret " + uri + " as an uri"); } else if (u.getScheme().equals("file")) { -- 2.30.2