Fix the "object new" fix

Relates to MID-6899. (cherry picked from commit c6010aa)
Evolveum · Mar 23, 2021 · 610edbf · 610edbf
1 parent 40b4332
commit 610edbf
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
@@ -251,17 +251,25 @@ public void setSyncDelta(ObjectDelta<ShadowType> syncDelta) {
     }
 
     public ObjectDeltaObject<ShadowType> getObjectDeltaObject() throws SchemaException {
-        PrismObject<ShadowType> base = objectCurrent;
         ObjectDelta<ShadowType> currentDelta = getCurrentDelta();
-        if (base == null && (ObjectDelta.isModify(currentDelta) || decisionIsAdd())) {
+        PrismObject<ShadowType> base;
+        if (shouldCreateObjectNew(currentDelta)) {
             RefinedObjectClassDefinition rOCD = getCompositeObjectClassDefinition();
             if (rOCD != null) {
                 base = rOCD.createBlankShadow(resourceShadowDiscriminator.getTag());
+            } else {
+                base = null;
             }
+        } else {
+            base = objectCurrent;
         }
         return new ObjectDeltaObject<>(base, currentDelta, objectNew, getObjectDefinition());
     }
 
+    private boolean shouldCreateObjectNew(ObjectDelta<ShadowType> currentDelta) {
+        return objectCurrent == null && (ObjectDelta.isModify(currentDelta) || currentDelta == null && decisionIsAdd());
+    }
+
     @Override
     public ObjectDelta<ShadowType> getSummaryDelta() {
         return getCurrentDelta();
@@ -827,7 +835,7 @@ public void recompute() throws SchemaException {
         PrismObject<ShadowType> base;
         if (objectCurrent == null && ObjectDelta.isAdd(syncDelta)) {
             base = syncDelta.getObjectToAdd();
-        } else if (objectCurrent == null && (ObjectDelta.isModify(currentDelta) || decisionIsAdd())) {
+        } else if (shouldCreateObjectNew(currentDelta)) {
             RefinedObjectClassDefinition rOCD = getCompositeObjectClassDefinition();
             if (rOCD != null) {
                 base = rOCD.createBlankShadow(resourceShadowDiscriminator.getTag());