Fix "immutable primary delta" fix (MID-6097)

Evolveum · Mar 5, 2020 · d4a9ada · d4a9ada
1 parent eb894e6
commit d4a9ada
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
@@ -259,7 +259,7 @@ public void addPrimaryDelta(ObjectDelta<O> delta) throws SchemaException {
     }
 
     public void swallowToPrimaryDelta(ItemDelta<?,?> itemDelta) throws SchemaException {
-        createOrModifyPrimaryDelta(
+        modifyOrCreatePrimaryDelta(
                 delta -> delta.swallow(itemDelta),
                 () -> {
                     ObjectDelta<O> newPrimaryDelta = getPrismContext().deltaFactory().object().create(getObjectTypeClass(), ChangeType.MODIFY);
@@ -279,15 +279,15 @@ private interface DeltaCreator<O extends Objectable> {
         ObjectDelta<O> create() throws SchemaException;
     }
 
-    private void createOrModifyPrimaryDelta(DeltaModifier<O> modifier, DeltaCreator<O> creator) throws SchemaException {
+    private void modifyOrCreatePrimaryDelta(DeltaModifier<O> modifier, DeltaCreator<O> creator) throws SchemaException {
         if (primaryDelta == null) {
             primaryDelta = creator.create();
         } else if (!primaryDelta.isImmutable()) {
             modifier.modify(primaryDelta);
         } else {
-            primaryDelta = primaryDelta.clone();
+            primaryDelta.setImmutable(false);
             modifier.modify(primaryDelta);
-            primaryDelta.freeze();
+            primaryDelta.setImmutable(true);
         }
     }