X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.jcr%2Fsrc%2Forg%2Fargeo%2Fjcr%2Ffs%2FJcrFileSystemProvider.java;h=bd0befe7c6c3346bdbc946b9010e4d21c4f35f79;hb=638e94cf1ad4bea9ce39232725d4e21775ce49b3;hp=7dbd4e43f88116e96a127b3b305fd1fae8dfe515;hpb=b6043d2ee4bf015195c91825ba31164899c236fe;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java b/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java
index 7dbd4e43f..bd0befe7c 100644
--- a/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java
@@ -32,6 +32,7 @@ import javax.jcr.nodetype.PropertyDefinition;
 
 import org.argeo.jcr.JcrUtils;
 
+/** Operations on a {@link JcrFileSystem}. */
 public abstract class JcrFileSystemProvider extends FileSystemProvider {
 
 	@Override
@@ -51,7 +52,7 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 				fileName = Text.escapeIllegalJcrChars(fileName);
 				node = parent.addNode(fileName, NodeType.NT_FILE);
 				node.addMixin(NodeType.MIX_CREATED);
-				node.addMixin(NodeType.MIX_LAST_MODIFIED);
+//				node.addMixin(NodeType.MIX_LAST_MODIFIED);
 			}
 			if (!node.isNodeType(NodeType.NT_FILE))
 				throw new UnsupportedOperationException(node + " must be a file");
@@ -82,15 +83,18 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 				Node parent = toNode(dir.getParent());
 				if (parent == null)
 					throw new IOException("Parent of " + dir + " does not exist");
-				if (parent.getPrimaryNodeType().isNodeType(NodeType.NT_FILE)
-						|| parent.getPrimaryNodeType().isNodeType(NodeType.NT_LINKED_FILE))
-					throw new IOException(dir + " parent is a file");
-				String fileName = dir.getFileName().toString();
-				fileName = Text.escapeIllegalJcrChars(fileName);
-				node = parent.addNode(fileName, NodeType.NT_FOLDER);
-				node.addMixin(NodeType.MIX_CREATED);
-				node.addMixin(NodeType.MIX_LAST_MODIFIED);
-				node.getSession().save();
+				Session session = parent.getSession();
+				synchronized (session) {
+					if (parent.getPrimaryNodeType().isNodeType(NodeType.NT_FILE)
+							|| parent.getPrimaryNodeType().isNodeType(NodeType.NT_LINKED_FILE))
+						throw new IOException(dir + " parent is a file");
+					String fileName = dir.getFileName().toString();
+					fileName = Text.escapeIllegalJcrChars(fileName);
+					node = parent.addNode(fileName, NodeType.NT_FOLDER);
+					node.addMixin(NodeType.MIX_CREATED);
+					node.addMixin(NodeType.MIX_LAST_MODIFIED);
+					save(session);
+				}
 			} else {
 				// if (!node.getPrimaryNodeType().isNodeType(NodeType.NT_FOLDER))
 				// throw new FileExistsException(dir + " exists and is not a directory");
@@ -108,14 +112,17 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 			if (node == null)
 				throw new NoSuchFileException(path + " does not exist");
 			Session session = node.getSession();
-			if (node.getPrimaryNodeType().isNodeType(NodeType.NT_FILE))
-				node.remove();
-			else if (node.getPrimaryNodeType().isNodeType(NodeType.NT_FOLDER)) {
-				if (node.hasNodes())// TODO check only files
-					throw new DirectoryNotEmptyException(path.toString());
-				node.remove();
+			synchronized (session) {
+				session.refresh(false);
+				if (node.getPrimaryNodeType().isNodeType(NodeType.NT_FILE))
+					node.remove();
+				else if (node.getPrimaryNodeType().isNodeType(NodeType.NT_FOLDER)) {
+					if (node.hasNodes())// TODO check only files
+						throw new DirectoryNotEmptyException(path.toString());
+					node.remove();
+				}
+				save(session);
 			}
-			session.save();
 		} catch (RepositoryException e) {
 			discardChanges(node);
 			throw new IOException("Cannot delete " + path, e);
@@ -128,8 +135,11 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 		Node sourceNode = toNode(source);
 		Node targetNode = toNode(target);
 		try {
-			JcrUtils.copy(sourceNode, targetNode);
-			sourceNode.getSession().save();
+			Session targetSession = targetNode.getSession();
+			synchronized (targetSession) {
+				JcrUtils.copy(sourceNode, targetNode);
+				save(targetSession);
+			}
 		} catch (RepositoryException e) {
 			discardChanges(sourceNode);
 			discardChanges(targetNode);
@@ -142,8 +152,10 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 		Node sourceNode = toNode(source);
 		try {
 			Session session = sourceNode.getSession();
-			session.move(sourceNode.getPath(), target.toString());
-			session.save();
+			synchronized (session) {
+				session.move(sourceNode.getPath(), target.toString());
+				save(session);
+			}
 		} catch (RepositoryException e) {
 			discardChanges(sourceNode);
 			throw new IOException("Cannot move from " + source + " to " + target, e);
@@ -253,14 +265,17 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 	public void setAttribute(Path path, String attribute, Object value, LinkOption... options) throws IOException {
 		Node node = toNode(path);
 		try {
-			if (value instanceof byte[]) {
-				JcrUtils.setBinaryAsBytes(node, attribute, (byte[]) value);
-			} else if (value instanceof Calendar) {
-				node.setProperty(attribute, (Calendar) value);
-			} else {
-				node.setProperty(attribute, value.toString());
+			Session session = node.getSession();
+			synchronized (session) {
+				if (value instanceof byte[]) {
+					JcrUtils.setBinaryAsBytes(node, attribute, (byte[]) value);
+				} else if (value instanceof Calendar) {
+					node.setProperty(attribute, (Calendar) value);
+				} else {
+					node.setProperty(attribute, value.toString());
+				}
+				save(session);
 			}
-			node.getSession().save();
 		} catch (RepositoryException e) {
 			discardChanges(node);
 			throw new IOException("Cannot set attribute " + attribute + " on " + path, e);
@@ -289,6 +304,13 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 		}
 	}
 
+	/** Make sure save is robust. */
+	protected void save(Session session) throws RepositoryException {
+		session.refresh(true);
+		session.save();
+		session.notifyAll();
+	}
+
 	/**
 	 * To be overriden in order to support the ~ path, with an implementation
 	 * specific concept of user home.