X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fparts%2FUserBatchUpdateWizard.java;h=31b2042b6ec14d2ec91eabefc5f43d2af0697c50;hb=8260f4470f514ea347ca53f5b4dfc632c4a4de66;hp=80c817ebeb6b993d5321fbd085fce05adec89fd5;hpb=3a0d866fbeea3f78c293212f4b4fbaeba7dfe2bd;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java
index 80c817ebe..31b2042b6 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java
@@ -18,7 +18,6 @@ import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.parts.LdifUsersTable;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.osgi.useradmin.LdifName;
-import org.argeo.security.ui.admin.internal.UiAdminUtils;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.argeo.security.ui.admin.internal.providers.CommonNameLP;
 import org.argeo.security.ui.admin.internal.providers.DomainNameLP;
@@ -140,18 +139,16 @@ public class UserBatchUpdateWizard extends Wizard {
 
 		@SuppressWarnings("unchecked")
 		protected void doUpdate() {
-			UserTransaction userTransaction = userAdminWrapper
-					.beginTransactionIfNeeded();
+			userAdminWrapper.beginTransactionIfNeeded();
 			try {
 				for (User user : usersToUpdate) {
 					// the char array is emptied after being used.
 					user.getCredentials().put(null, newPwd.clone());
 				}
-				userTransaction.commit();
-				UiAdminUtils.notifyTransactionStateChange(userTransaction);
+				userAdminWrapper.commitOrNotifyTransactionStateChange();
 			} catch (Exception e) {
-				throw new CmsException(
-						"Cannot perform batch update on users", e);
+				throw new CmsException("Cannot perform batch update on users",
+						e);
 			} finally {
 				UserTransaction ut = userAdminWrapper.getUserTransaction();
 				try {
@@ -495,8 +492,8 @@ public class UserBatchUpdateWizard extends Wizard {
 					roles = userAdminWrapper.getUserAdmin().getRoles(
 							builder.toString());
 				} catch (InvalidSyntaxException e) {
-					throw new CmsException(
-							"Unable to get roles with filter: " + filter, e);
+					throw new CmsException("Unable to get roles with filter: "
+							+ filter, e);
 				}
 				List<User> users = new ArrayList<User>();
 				for (Role role : roles)