From 6d74fdf8f6d42c373a2096c65f797140f59b9b5a Mon Sep 17 00:00:00 2001 From: Katarina Valalikova Date: Tue, 10 Mar 2020 12:28:10 +0100 Subject: [PATCH] ooops, something went wrong during conflict resolution.. clone() applied as in aa6c114c0b02585b8f302ae19719c169a955c4ff --- .../midpoint/web/page/admin/PageAdminObjectDetails.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java index 35ae48728f2..3921d836411 100755 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java @@ -604,7 +604,7 @@ protected PrismObjectWrapper loadObjectWrapper(PrismObject objectToEdit, b object = (PrismObject) focusType.asPrismObject(); } else { LOGGER.trace("Loading object: New object (supplied): {}", objectToEdit); - object = objectToEdit; + object = objectToEdit.clone(); } } else { @@ -648,7 +648,7 @@ protected PrismObjectWrapper loadObjectWrapper(PrismObject 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);