merge: fixed handling of multivalue properties

Evolveum · Mar 26, 2024 · 73c8b6b · 73c8b6b
1 parent 6e73874
commit 73c8b6b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/GenericItemMerger.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/GenericItemMerger.java
@@ -363,9 +363,10 @@ private void mergeMultiValuedItem(Item<?, ?> targetItem, Item<?, ?> sourceItem)
     private PrismValue addIfNotThere(Item<?, ?> targetItem, PrismValue sourceValue) throws SchemaException {
         //noinspection unchecked
         Item<PrismValue, ?> target = (Item<PrismValue, ?>) targetItem;
-        if (target.contains(sourceValue, VALUE_COMPARISON_STRATEGY)) {
+        PrismValue existing = target.findValue(sourceValue, VALUE_COMPARISON_STRATEGY);
+        if (existing != null) {
             LOGGER.trace("     (but target contains the corresponding value - not adding)");
-            return null;
+            return existing ;
         }
 
         PrismValue cloned = createMarkedClone(sourceValue);