Skip to content

Commit

Permalink
MID-7778:fix for error message during reconcile of users
Browse files Browse the repository at this point in the history
  • Loading branch information
skublik committed Mar 28, 2022
1 parent 90d96fd commit b9c2ee3
Showing 1 changed file with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -393,8 +393,9 @@ private void reconcilePerformed(AjaxRequestTarget target, IModel<SelectableBean<
OperationResult result = new OperationResult(OPERATION_RECONCILE_USERS);
for (SelectableBean<UserType> user : users) {
OperationResult opResult = result.createSubresult(getString(OPERATION_RECONCILE_USER, user));
UserType userType = user.getValue();
try {
Task task = createSimpleTask(OPERATION_RECONCILE_USER + user);
Task task = createSimpleTask(OPERATION_RECONCILE_USER + userType);
ObjectDelta delta = getPrismContext().deltaFactory().object().createEmptyModifyDelta(UserType.class, user.getValue().getOid()
);
Collection<ObjectDelta<? extends ObjectType>> deltas = MiscUtil.createCollection(delta);
Expand All @@ -403,8 +404,8 @@ private void reconcilePerformed(AjaxRequestTarget target, IModel<SelectableBean<
opResult.computeStatusIfUnknown();
} catch (Exception ex) {
opResult.recomputeStatus();
opResult.recordFatalError(getString("PageUsers.message.reconcile.fatalError", user), ex);
LoggingUtils.logUnexpectedException(LOGGER, "Couldn't reconcile user " + user + ".", ex);
opResult.recordFatalError(getString("PageUsers.message.reconcile.fatalError", userType), ex);
LoggingUtils.logUnexpectedException(LOGGER, "Couldn't reconcile user " + userType + ".", ex);
}
}

Expand Down

0 comments on commit b9c2ee3

Please sign in to comment.