Fix ADD operation multi-connector uniqueness check

The (correct) tightening up UCF fetchObject method identifiers parameter to be primary-only in 4896e6c revealed a bug in ADD operation multi-connector case uniqueness check. It is now fixed. This fixes failing TestWriter story test.
Evolveum · Nov 8, 2023 · 6606b36 · 6606b36
1 parent 4896e6c
commit 6606b36
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/...a/com/evolveum/midpoint/provisioning/impl/resourceobjects/ResourceObjectAddOperation.java b/...a/com/evolveum/midpoint/provisioning/impl/resourceobjects/ResourceObjectAddOperation.java
@@ -161,13 +161,18 @@ private void checkForAddConflictsForMultiConnectors(OperationResult result)
                 // that we normally do not need or want.
                 return;
             }
-            ResourceObjectIdentification.Primary identification =
+            ResourceObjectIdentification identification =
                     ResourceObjectIdentification
-                            .fromShadow(ctx.getObjectDefinitionRequired(), shadowClone)
-                            .ensurePrimary();
+                            .fromShadow(ctx.getObjectDefinitionRequired(), shadowClone);
+
+            if (identification instanceof ResourceObjectIdentification.Primary primaryIdentification) {
+                existingObject = readConnector.fetchObject(
+                        primaryIdentification, null, ctx.getUcfExecutionContext(), result);
+            } else {
+                LOGGER.trace("No primary identifier present, skipping add conflict check for {}", identification);
+                existingObject = null;
+            }
 
-            existingObject =
-                    readConnector.fetchObject(identification, null, ctx.getUcfExecutionContext(), result);
         } catch (ObjectNotFoundException e) {
             // This is OK
             result.muteLastSubresultError();