X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FJcrUtils.java;h=d879c64fb287a7672ac317353eb3603978884944;hb=b688a5a11f8f6d81b6985a7e6ff2895df27084f5;hp=4e197d5fbcd2a65e30775c7515668f8ec45bbcba;hpb=fbeb35568de37fb5073cca35ea545b643b9c60d4;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
index 4e197d5fb..d879c64fb 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
@@ -152,6 +152,19 @@ public class JcrUtils {
 			if (path.equals('/'))
 				return session.getRootNode();
 
+			if (session.itemExists(path)) {
+				Node node = session.getNode(path);
+				// check type
+				if (type != null
+						&& !type.equals(node.getPrimaryNodeType().getName()))
+					throw new ArgeoException("Node " + node
+							+ " exists but is of type "
+							+ node.getPrimaryNodeType().getName()
+							+ " not of type " + type);
+				// TODO: check versioning
+				return node;
+			}
+
 			StringTokenizer st = new StringTokenizer(path, "/");
 			StringBuffer current = new StringBuffer("/");
 			Node currentNode = session.getRootNode();