X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui.admin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Fwizards%2FNewUserWizard.java;h=b99570c200dae79345d0b4fbdb7468c86ebc3a3f;hb=ffa37ce4afa9b5e7e40420b1837a203bca832cf4;hp=493e1881f526a325efd9a8d88c8dbfa6d264a402;hpb=fb4f7c451ea7d9025f7cf7fe032020f229df794a;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/NewUserWizard.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/NewUserWizard.java
index 493e1881f..b99570c20 100644
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/NewUserWizard.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/NewUserWizard.java
@@ -1,8 +1,11 @@
 package org.argeo.security.ui.admin.wizards;
 
 import javax.jcr.Node;
+import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.eclipse.ui.dialogs.Error;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.jcr.JcrUtils;
@@ -13,6 +16,8 @@ import org.springframework.security.GrantedAuthority;
 
 /** Wizard to create a new user */
 public class NewUserWizard extends Wizard {
+	private final static Log log = LogFactory.getLog(NewUserWizard.class);
+
 	private String homeBasePath = "/home";
 	private Session session;
 	private UserAdminService userAdminService;
@@ -36,8 +41,8 @@ public class NewUserWizard extends Wizard {
 		if (!canFinish())
 			return false;
 
+		String username = mainUserInfo.getUsername();
 		try {
-			String username = mainUserInfo.getUsername();
 			session.save();
 			Node userHome = JcrUtils.createUserHome(session, homeBasePath,
 					username);
@@ -52,7 +57,18 @@ public class NewUserWizard extends Wizard {
 			return true;
 		} catch (Exception e) {
 			JcrUtils.discardQuietly(session);
-			Error.show("Cannot create new user", e);
+			Node userHome = JcrUtils.getUserHome(session, username);
+			if (userHome != null) {
+				try {
+					userHome.remove();
+					session.save();
+				} catch (RepositoryException e1) {
+					JcrUtils.discardQuietly(session);
+					log.warn("Error when trying to clean up failed new user "
+							+ username, e1);
+				}
+			}
+			Error.show("Cannot create new user " + username, e);
 			return false;
 		}
 	}