[midPoint-git] [Evolveum/midpoint] 600721: MID-11101 Fix skipped approval ADD delta merging

[Smoľaková Vanesa]

  Branch: refs/heads/fix/MID-11101
  Home:   https://github.com/Evolveum/midpoint
  Commit: 600721c6edd5dadca3fefdbc0754e366e2cedfe9
      https://github.com/Evolveum/midpoint/commit/600721c6edd5dadca3fefdbc0754e366e2cedfe9
  Author: Vanesa Smoľaková <smolakovavanesa at gmail.com>
  Date:   2026-05-28 (Thu, 28 May 2026)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ObjectTreeDeltas.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/objects/TestObjectLifecycleApprovalSkipped.java
    A model/workflow-impl/src/test/resources/objects/global-policy-rules-skipped.xml
    M model/workflow-impl/testng-integration.xml
    M release-notes.adoc

  Log Message:
  -----------
  MID-11101 Fix skipped approval ADD delta merging

Skipped approval instructions were merged back into changes without
approval using ordered merge. For ADD operations decomposed by approval
processing, this could leave an empty ADD placeholder and merge fragments
in an unsafe order.

Treat empty object deltas as absent during ObjectTreeDeltas merge, and
use unordered merge when returning skipped approval deltas. This lets
ADD operations continue normally when the whole approval processing is
automatically skipped.



To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/midpoint/settings/notifications