X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjcr%2Facr%2FJcrContentProvider.java;h=38bcd569212e6b7d371591f01b5b325d1decdf33;hb=4826f14b9084ad2b03375bec545fdcae1944dbdc;hp=eaa27b7fc631d806fde1f1590c0eca142f786cd7;hpb=553dacc628cfeba9c03c812d1ff585702f757dd6;p=gpl%2Fargeo-jcr.git

diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java
index eaa27b7..38bcd56 100644
--- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java
+++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java
@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Objects;
+import java.util.function.Function;
 
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -89,11 +90,24 @@ public class JcrContentProvider implements ContentProvider, NamespaceContext {
 		return mountPath;
 	}
 
+	public synchronized <T> T doInAdminSession(Function<Session, T> toDo) {
+		try {
+			return toDo.apply(adminSession);
+		} finally {
+			try {
+				if (adminSession.hasPendingChanges())
+					adminSession.save();
+			} catch (RepositoryException e) {
+				throw new JcrException("Cannot save admin session", e);
+			}
+		}
+	}
+
 	/*
 	 * NAMESPACE CONTEXT
 	 */
 	@Override
-	public String getNamespaceURI(String prefix) {
+	public synchronized String getNamespaceURI(String prefix) {
 		try {
 			return adminSession.getNamespaceURI(prefix);
 		} catch (RepositoryException e) {
@@ -102,7 +116,7 @@ public class JcrContentProvider implements ContentProvider, NamespaceContext {
 	}
 
 	@Override
-	public String getPrefix(String namespaceURI) {
+	public synchronized String getPrefix(String namespaceURI) {
 		try {
 			return adminSession.getNamespacePrefix(namespaceURI);
 		} catch (RepositoryException e) {
@@ -111,7 +125,7 @@ public class JcrContentProvider implements ContentProvider, NamespaceContext {
 	}
 
 	@Override
-	public Iterator<String> getPrefixes(String namespaceURI) {
+	public synchronized Iterator<String> getPrefixes(String namespaceURI) {
 		try {
 			return Arrays.asList(adminSession.getNamespacePrefix(namespaceURI)).iterator();
 		} catch (RepositoryException e) {