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=facd475cafd1e789c1689e7f88e317ff1ec1d749;hb=8b8ee149b20e2578a55e17413fa5f7399ff7ba14;hp=5efc240498f198283b03848934a26adfd297f27b;hpb=22365726e2fdcb12e76c3d78060960ae7161628e;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 5efc24049..facd475ca 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
@@ -632,16 +632,18 @@ public class JcrUtils implements ArgeoJcrConstants {
 							relPath, p.getValue(), null);
 					diffs.put(relPath, pDiff);
 				} else {
-					if (p.isMultiple())
-						continue props;
-					Value referenceValue = p.getValue();
-					Value newValue = observed.getProperty(name).getValue();
-					if (!referenceValue.equals(newValue)) {
-						String relPath = propertyRelPath(baseRelPath, name);
-						PropertyDiff pDiff = new PropertyDiff(
-								PropertyDiff.MODIFIED, relPath, referenceValue,
-								newValue);
-						diffs.put(relPath, pDiff);
+					if (p.isMultiple()) {
+						// FIXME implement multiple
+					} else {
+						Value referenceValue = p.getValue();
+						Value newValue = observed.getProperty(name).getValue();
+						if (!referenceValue.equals(newValue)) {
+							String relPath = propertyRelPath(baseRelPath, name);
+							PropertyDiff pDiff = new PropertyDiff(
+									PropertyDiff.MODIFIED, relPath,
+									referenceValue, newValue);
+							diffs.put(relPath, pDiff);
+						}
 					}
 				}
 			}
@@ -653,10 +655,14 @@ public class JcrUtils implements ArgeoJcrConstants {
 				if (name.startsWith("jcr:"))
 					continue props;
 				if (!reference.hasProperty(name)) {
-					String relPath = propertyRelPath(baseRelPath, name);
-					PropertyDiff pDiff = new PropertyDiff(PropertyDiff.ADDED,
-							relPath, null, p.getValue());
-					diffs.put(relPath, pDiff);
+					if (p.isMultiple()) {
+						// FIXME implement multiple
+					} else {
+						String relPath = propertyRelPath(baseRelPath, name);
+						PropertyDiff pDiff = new PropertyDiff(
+								PropertyDiff.ADDED, relPath, null, p.getValue());
+						diffs.put(relPath, pDiff);
+					}
 				}
 			}
 		} catch (RepositoryException e) {
@@ -994,8 +1000,8 @@ public class JcrUtils implements ArgeoJcrConstants {
 			Constraint constraint = qomf.comparison(userIdDop,
 					QueryObjectModelFactory.JCR_OPERATOR_EQUAL_TO, userIdSop);
 			Query query = qomf.createQuery(sel, constraint, null, null);
-			Node userHome = JcrUtils.querySingleNode(query);
-			return userHome;
+			Node userProfile = JcrUtils.querySingleNode(query);
+			return userProfile;
 		} catch (RepositoryException e) {
 			throw new ArgeoException(
 					"Cannot find profile for user " + username, e);
@@ -1036,8 +1042,12 @@ public class JcrUtils implements ArgeoJcrConstants {
 			} else {
 				userProfile = userHome.addNode(ArgeoNames.ARGEO_PROFILE);
 				userProfile.addMixin(ArgeoTypes.ARGEO_USER_PROFILE);
+				// session.getWorkspace().getVersionManager()
+				// .checkout(userProfile.getPath());
 				userProfile.setProperty(ArgeoNames.ARGEO_USER_ID, username);
 				session.save();
+				session.getWorkspace().getVersionManager()
+						.checkin(userProfile.getPath());
 				// we need to save the profile before adding the user home type
 			}
 			userHome.addMixin(ArgeoTypes.ARGEO_USER_HOME);