Fixed early exit on special case [] == null

Signed-off-by: Tony Tkacik <tonydamage@gmail.com>
Evolveum · May 12, 2021 · 05ab5b0 · 05ab5b0
1 parent 317a3fc
commit 05ab5b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemImpl.java
@@ -594,7 +594,7 @@ boolean diffInternal(Item<V, D> other, Collection<? extends ItemDelta> deltas, b
         ItemDelta delta = createDelta();
         if (other == null) {
             // Early exit for equals use case
-            if (exitOnDiff) {
+            if (exitOnDiff && hasAnyValue()) {
                 return true;
             }
 

diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java
@@ -47,6 +47,7 @@ public class PrismContainerValueImpl<C extends Containerable> extends PrismValue
 
 
     public static final RuntimeException DIFFERENT_ITEMS_EXCEPTION = new ItemDifferentException();
+    private static final boolean EARLY_EXIT = true;
 
     static {
         DIFFERENT_ITEMS_EXCEPTION.fillInStackTrace();
@@ -1131,11 +1132,16 @@ private boolean diffItems(PrismContainerValue<C> thisValue, PrismContainerValue<
                 }
             }
 
-            // Other has an item that we don't have, this must be an add
+            // Other item has no values
+            if(otherItem.hasNoValues()) {
+                continue;
+            }
             if (exitOnDiff) {
                 return true;
             }
+
             ItemDelta itemDelta = otherItem.createDelta();
+
             itemDelta.addValuesToAdd(otherItem.getClonedValues());
             if (!itemDelta.isEmpty()) {
                 ((Collection) deltas).add(itemDelta);
@@ -1446,7 +1452,7 @@ private boolean equals(@NotNull PrismContainerValue<?> other, ParameterizedEquiv
     private boolean equalsItems(PrismContainerValue<C> other, ParameterizedEquivalenceStrategy strategy) {
         Collection<? extends ItemDelta<?, ?>> deltas = FailOnAddList.INSTANCE;
         try {
-            boolean different = diffItems(this, other, deltas, strategy, true);
+            boolean different = diffItems(this, other, deltas, strategy, EARLY_EXIT);
             if (different) {
                 return false;
             }