X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FMountManager.java;h=36b0cfe5ed051f05a129f40864b2ef4f05380001;hb=6574e373669c5cdc090a4a832d7c717f6677e63e;hp=69b76ddc641f859bafb0ca2083b7ab9ccc5b1805;hpb=f3ea14abccc33b1c3326417a87c91145be776c72;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/acr/MountManager.java b/org.argeo.cms/src/org/argeo/cms/acr/MountManager.java index 69b76ddc6..36b0cfe5e 100644 --- a/org.argeo.cms/src/org/argeo/cms/acr/MountManager.java +++ b/org.argeo.cms/src/org/argeo/cms/acr/MountManager.java @@ -48,12 +48,19 @@ class MountManager { } synchronized ContentProvider findContentProvider(String path) { +// if (ContentUtils.EMPTY.equals(path)) +// return partitions.firstEntry().getValue(); Map.Entry entry = partitions.floorEntry(path); if (entry == null) - throw new IllegalArgumentException("No entry provider found for " + path); + throw new IllegalArgumentException("No entry provider found for path '" + path + "'"); String mountPath = entry.getKey(); - if (!path.startsWith(mountPath)) - throw new IllegalArgumentException("Path " + path + " doesn't have a content provider"); + if (!path.startsWith(mountPath)) { + // FIXME make it more robust and find when there is no content provider + String[] parent = ContentUtils.getParentPath(path); + return findContentProvider(parent[0]); + // throw new IllegalArgumentException("Path " + path + " doesn't have a content + // provider"); + } ContentProvider contentProvider = entry.getValue(); assert mountPath.equals(contentProvider.getMountPath()); return contentProvider;