fix fo MID-6009 - ITSM Manual connector shadow conflict

(cherry picked from commit e911c7a)
Evolveum · Mar 16, 2020 · dd7dd75 · dd7dd75
1 parent 63e8481
commit dd7dd75
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/.../provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java b/.../provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
@@ -1457,6 +1457,19 @@ private PrismObject<ShadowType> refreshShadowAsyncStatus(ProvisioningContext ctx
             if (operationCompleted && gracePeriod == null) {
                 LOGGER.trace("Deleting pending operation because it is completed (no grace): {}", pendingOperation);
                 shadowDelta.addModificationDeleteContainer(ShadowType.F_PENDING_OPERATION, pendingOperation.clone());
+
+                ObjectDeltaType pendingDeltaType = pendingOperation.getDelta();
+                ObjectDelta<ShadowType> pendingDelta = DeltaConvertor.createObjectDelta(pendingDeltaType, prismContext);
+
+                if (pendingDelta.isAdd()) {
+                    shadowInception = true;
+                }
+
+                if (pendingDelta.isDelete()) {
+                    shadowInception = false;
+                    shadowManager.addDeadShadowDeltas(repoShadow, refreshAsyncResult, (List)shadowDelta.getModifications());
+                }
+
                 continue;
 
             } else {

diff --git a/...ain/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java b/...ain/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java
@@ -348,6 +348,8 @@ private OperationResultStatus translateOutcome(String outcome) {
             return null;
         } else if (outcome.equals(OperationResultStatusType.SUCCESS.value())) {
             return OperationResultStatus.SUCCESS;
+        } else if (SchemaConstants.MODEL_APPROVAL_OUTCOME_APPROVE.equals(outcome)) {
+            return OperationResultStatus.SUCCESS;
         } else {
             return OperationResultStatus.UNKNOWN;
         }