X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fcommands%2FNewUser.java;h=c04c83562f3cad02fdbbed82a40b5eedf4cd728e;hb=8260f4470f514ea347ca53f5b4dfc632c4a4de66;hp=e408b1bee1793163eca3aead29d2831c6e4d14b3;hpb=89ad04528a66488eb3ad6f51c198d5df3c81b04c;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
index e408b1bee..c04c83562 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
@@ -23,7 +23,7 @@ import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
 
-import org.argeo.ArgeoException;
+import org.argeo.cms.CmsException;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
@@ -106,8 +106,8 @@ public class NewUser extends AbstractHandler {
 			if (!canFinish())
 				return false;
 			String username = mainUserInfo.getUsername();
+			userAdminWrapper.beginTransactionIfNeeded();
 			try {
-				userAdminWrapper.beginTransactionIfNeeded();
 				User user = (User) userAdminWrapper.getUserAdmin().createRole(
 						getDn(username), Role.USER);
 
@@ -132,7 +132,7 @@ public class NewUser extends AbstractHandler {
 
 				char[] password = mainUserInfo.getPassword();
 				user.getCredentials().put(null, password);
-
+				userAdminWrapper.commitOrNotifyTransactionStateChange();
 				userAdminWrapper.notifyListeners(new UserAdminEvent(null,
 						UserAdminEvent.ROLE_CREATED, user));
 				return true;
@@ -289,7 +289,7 @@ public class NewUser extends AbstractHandler {
 		private void initialiseDnCmb(Combo combo) {
 			Map<String, String> dns = userAdminWrapper.getKnownBaseDns(true);
 			if (dns.isEmpty())
-				throw new ArgeoException(
+				throw new CmsException(
 						"No writable base dn found. Cannot create user");
 			combo.setItems(dns.keySet().toArray(new String[0]));
 			if (dns.size() == 1)
@@ -306,7 +306,7 @@ public class NewUser extends AbstractHandler {
 				return username + "@" + (String) rdns.get(1).getValue() + '.'
 						+ (String) rdns.get(0).getValue();
 			} catch (InvalidNameException e) {
-				throw new ArgeoException("Unable to generate mail for "
+				throw new CmsException("Unable to generate mail for "
 						+ username + " with base dn " + baseDn, e);
 			}
 		}