X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FCmsContentSession.java;h=04a6fea6cdf15ad231127f66b79c7153981289d1;hb=a97cc867b992ba7543e0ff3fc87b4fc41edeaa88;hp=daefe9835e371c4210bf6487ce108ac04700e05d;hpb=0bccba2b9f1ac5d0be1a06dcb4fe56859f641b9a;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java
index daefe9835..04a6fea6c 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java
@@ -74,7 +74,7 @@ class CmsContentSession implements ProvidedSession, UuidIdentified {
 			throw new IllegalArgumentException(path + " is not an absolute path");
 		ContentProvider contentProvider = contentRepository.getMountManager().findContentProvider(path);
 		String mountPath = contentProvider.getMountPath();
-		String relativePath = ContentUtils.relativize(mountPath, path);
+		String relativePath = CmsContent.relativize(mountPath, path);
 		ProvidedContent content = contentProvider.get(CmsContentSession.this, relativePath);
 		return content;
 	}
@@ -85,7 +85,7 @@ class CmsContentSession implements ProvidedSession, UuidIdentified {
 			throw new IllegalArgumentException(path + " is not an absolute path");
 		ContentProvider contentProvider = contentRepository.getMountManager().findContentProvider(path);
 		String mountPath = contentProvider.getMountPath();
-		String relativePath = ContentUtils.relativize(mountPath, path);
+		String relativePath = CmsContent.relativize(mountPath, path);
 		return contentProvider.exists(this, relativePath);
 	}
 
@@ -113,7 +113,7 @@ class CmsContentSession implements ProvidedSession, UuidIdentified {
 	 */
 	@Override
 	public Content getMountPoint(String path) {
-		String[] parent = ContentUtils.getParentPath(path);
+		String[] parent = CmsContent.getParentPath(path);
 		ProvidedContent mountParent = (ProvidedContent) get(parent[0]);
 //			Content mountPoint = mountParent.getProvider().get(CmsContentSession.this, null, path);
 		return mountParent.getMountPoint(parent[1]);
@@ -206,10 +206,12 @@ class CmsContentSession implements ProvidedSession, UuidIdentified {
 			NavigableMap<String, ContentProvider> contentProviders = contentRepository.getMountManager()
 					.findContentProviders(scopePath);
 			for (Map.Entry<String, ContentProvider> contentProvider : contentProviders.entrySet()) {
+				assert scopePath.startsWith(contentProvider.getKey())
+						: "scopePath=" + scopePath + ", contentProvider path=" + contentProvider.getKey();
 				// TODO deal with depth
 				String relPath;
-				if (scopePath.startsWith(contentProvider.getKey())) {
-					relPath = scopePath.substring(contentProvider.getKey().length());
+				if (!scopePath.equals(contentProvider.getKey())) {
+					relPath = scopePath.substring(contentProvider.getKey().length() + 1, scopePath.length());
 				} else {
 					relPath = null;
 				}
@@ -217,6 +219,8 @@ class CmsContentSession implements ProvidedSession, UuidIdentified {
 				searchPartitions.put(contentProvider.getKey(), searchPartition);
 			}
 		}
+		if (searchPartitions.isEmpty())
+			return Stream.empty();
 		return StreamSupport.stream(new SearchPartitionsSpliterator(searchPartitions), true);
 	}