Skip to content

Commit

Permalink
ooops, something went wrong during conflict resolution.. clone() appl…
Browse files Browse the repository at this point in the history
…ied as in aa6c114
  • Loading branch information
katkav committed Mar 10, 2020
1 parent f103608 commit 6d74fdf
Showing 1 changed file with 2 additions and 2 deletions.
Expand Up @@ -604,7 +604,7 @@ protected PrismObjectWrapper<O> loadObjectWrapper(PrismObject<O> objectToEdit, b
object = (PrismObject<O>) focusType.asPrismObject();
} else {
LOGGER.trace("Loading object: New object (supplied): {}", objectToEdit);
object = objectToEdit;
object = objectToEdit.clone();
}
} else {

Expand Down Expand Up @@ -648,7 +648,7 @@ protected PrismObjectWrapper<O> loadObjectWrapper(PrismObject<O> objectToEdit, b


try {
wrapper = factory.createObjectWrapper(object.clone(), itemStatus, context);
wrapper = factory.createObjectWrapper(object, itemStatus, context);
} catch (Exception ex) {
result.recordFatalError(getString("PageAdminObjectDetails.message.loadObjectWrapper.fatalError"), ex);
LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load object", ex);
Expand Down

0 comments on commit 6d74fdf

Please sign in to comment.