X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FCmsContentSession.java;h=34d683605ac4e81240be687a04e4371f7e325d79;hb=138e686fbf65683c3c94a52f1cfbaf8e02362e19;hp=f811642c7f7f4971b379ac2aca0c709c104b61cb;hpb=dca2b13e0e3ca3e7a9469e089b980c48c880ad1a;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 f811642c7..34d683605 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentSession.java
@@ -1,8 +1,8 @@
 package org.argeo.cms.acr;
 
+import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
@@ -13,6 +13,7 @@ import javax.security.auth.Subject;
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentSession;
 import org.argeo.api.acr.CrName;
+import org.argeo.api.acr.DName;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedRepository;
@@ -34,7 +35,7 @@ class CmsContentSession implements ProvidedSession {
 
 	private CompletableFuture<ContentSession> edition;
 
-	private Set<ContentProvider> modifiedProviders = new TreeSet<>();
+	private Set<ContentProvider> modifiedProviders = new HashSet<>();
 
 	private Content sessionRunDir;
 
@@ -61,6 +62,8 @@ class CmsContentSession implements ProvidedSession {
 
 	@Override
 	public Content get(String path) {
+		if (!path.startsWith(ContentUtils.ROOT_SLASH))
+			throw new IllegalArgumentException(path + " is not an absolute path");
 		ContentProvider contentProvider = contentRepository.getMountManager().findContentProvider(path);
 		String mountPath = contentProvider.getMountPath();
 		String relativePath = extractRelativePath(mountPath, path);
@@ -70,6 +73,8 @@ class CmsContentSession implements ProvidedSession {
 
 	@Override
 	public boolean exists(String path) {
+		if (!path.startsWith(ContentUtils.ROOT_SLASH))
+			throw new IllegalArgumentException(path + " is not an absolute path");
 		ContentProvider contentProvider = contentRepository.getMountManager().findContentProvider(path);
 		String mountPath = contentProvider.getMountPath();
 		String relativePath = extractRelativePath(mountPath, path);
@@ -137,13 +142,16 @@ class CmsContentSession implements ProvidedSession {
 			work.accept(this);
 			return this;
 		}).thenApply((s) -> {
-			// TODO optimise
-			for (ContentProvider provider : modifiedProviders) {
-				if (provider instanceof DomContentProvider) {
-					((DomContentProvider) provider).persist(s);
+			synchronized (CmsContentSession.this) {
+				// TODO optimise
+				for (ContentProvider provider : modifiedProviders) {
+					if (provider instanceof DomContentProvider) {
+						((DomContentProvider) provider).persist(s);
+					}
 				}
+				modifiedProviders.clear();
+				return s;
 			}
-			return s;
 		});
 		return edition.minimalCompletionStage();
 	}
@@ -154,7 +162,7 @@ class CmsContentSession implements ProvidedSession {
 	}
 
 	@Override
-	public void notifyModification(ProvidedContent content) {
+	public synchronized void notifyModification(ProvidedContent content) {
 		ContentProvider contentProvider = content.getProvider();
 		modifiedProviders.add(contentProvider);
 	}
@@ -173,7 +181,7 @@ class CmsContentSession implements ProvidedSession {
 			else {
 				Content runDir = get(CmsContentRepository.RUN_BASE);
 				// TODO deal with no run dir available?
-				sessionRunDir = runDir.add(uuid.toString(), CrName.collection.qName());
+				sessionRunDir = runDir.add(uuid.toString(),DName.collection.qName());
 			}
 		}
 		return sessionRunDir;