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=b03be7396bdce3cd4b17733bd73058d5692d60d7;hb=2b8f41b43cc598398a4bb66dd46d7d87ac000134;hp=1cecd7100611744524da8e08296dbc49f00b935a;hpb=259ff4470799cb523f22af2be4a1e92b19f1d734;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 1cecd7100..b03be7396 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
@@ -847,15 +847,34 @@ public class JcrUtils implements ArgeoJcrConstants {
 			if (session.hasPendingChanges())
 				throw new ArgeoException(
 						"Session has pending changes, save them first");
+
 			String homePath = homeBasePath + '/'
 					+ firstCharsToPath(username, 2) + '/' + username;
-			Node userHome = JcrUtils.mkdirs(session, homePath);
 
-			Node userProfile = userHome.addNode(ArgeoNames.ARGEO_PROFILE);
-			userProfile.addMixin(ArgeoTypes.ARGEO_USER_PROFILE);
-			userProfile.setProperty(ArgeoNames.ARGEO_USER_ID, username);
-			session.save();
-			// we need to save the profile before adding the user home type
+			if (session.itemExists(homePath)) {
+				try {
+					throw new ArgeoException(
+							"Trying to create a user home that already exists");
+				} catch (Exception e) {
+					// we use this workaround to be sure to get the stack trace
+					// to identify the sink of the bug.
+					log.warn("trying to create an already existing userHome. Stack trace : ");
+					e.printStackTrace();
+				}
+			}
+
+			Node userHome = JcrUtils.mkdirs(session, homePath);
+			Node userProfile;
+			if (userHome.hasNode(ArgeoNames.ARGEO_PROFILE)) {
+				log.warn("User profile node already exists. We do not add a new one");
+
+			} else {
+				userProfile = userHome.addNode(ArgeoNames.ARGEO_PROFILE);
+				userProfile.addMixin(ArgeoTypes.ARGEO_USER_PROFILE);
+				userProfile.setProperty(ArgeoNames.ARGEO_USER_ID, username);
+				session.save();
+				// we need to save the profile before adding the user home type
+			}
 			userHome.addMixin(ArgeoTypes.ARGEO_USER_HOME);
 			// see
 			// http://jackrabbit.510166.n4.nabble.com/Jackrabbit-2-0-beta-6-Problem-adding-a-Mixin-type-with-mandatory-properties-after-setting-propertiesn-td1290332.html