X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjcr%2Facr%2FJcrSessionAdapter.java;h=58a5b77e58b78ec5811a32cca93eceaeb44ef458;hb=9740c5b4c510001454c14750df4ef5cc1d782be9;hp=0fc46b8c9cc734f344ecc2233922a006734d20a5;hpb=66005473fc4a5b87bd26da2ff4eec096534c9a55;p=gpl%2Fargeo-jcr.git

diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrSessionAdapter.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrSessionAdapter.java
index 0fc46b8..58a5b77 100644
--- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrSessionAdapter.java
+++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrSessionAdapter.java
@@ -107,22 +107,35 @@ class JcrSessionAdapter {
 	public synchronized Node openForEdit(String workspace, String jcrPath) throws RepositoryException {
 		Session session = getWriteSession(workspace);
 		Node node = session.getNode(jcrPath);
-		if (node.isNodeType(NodeType.MIX_SIMPLE_VERSIONABLE)) {
-			VersionManager versionManager = session.getWorkspace().getVersionManager();
-			if (versionManager.isCheckedOut(jcrPath)) {
+		VersionManager versionManager = session.getWorkspace().getVersionManager();
+
+		Node versionedAncestor = findVersionedAncestor(node);
+		boolean checkedOut = versionManager.isCheckedOut(jcrPath);
+
+		if (versionedAncestor != null) {
+			if (checkedOut) {
 				if (!checkedOutModified.containsKey(workspace))
 					checkedOutModified.put(workspace, new TreeSet<>());
-				checkedOutModified.get(workspace).add(jcrPath);
+				checkedOutModified.get(workspace).add(versionedAncestor.getPath());
 			} else {
 				if (!checkedInModified.containsKey(workspace))
 					checkedInModified.put(workspace, new TreeSet<>());
-				checkedInModified.get(workspace).add(jcrPath);
-				versionManager.checkout(jcrPath);
+				checkedInModified.get(workspace).add(versionedAncestor.getPath());
+				versionManager.checkout(versionedAncestor.getPath());
 			}
 		}
 		return node;
 	}
 
+	private Node findVersionedAncestor(Node node) throws RepositoryException {
+		if (node.isNodeType(NodeType.MIX_SIMPLE_VERSIONABLE))
+			return node;
+		Node parent = node.getParent();
+		if (parent == null)
+			return null;
+		return findVersionedAncestor(parent);
+	}
+
 	public synchronized Node freeze(String workspace, String jcrPath) throws RepositoryException {
 		Session session = getWriteSession(workspace);
 		Node node = session.getNode(jcrPath);