fix for 'legal' and 'assigned' variables when adding existed projecti…

…on (MID-6008)
Evolveum · Mar 20, 2020 · ca5728e · ca5728e
1 parent 975f5c2
commit ca5728e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.java b/.../src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.java
@@ -103,8 +103,13 @@ DeltaMapTriple<K, ConstructionPack<T>> processConstructions(LensContext<F> conte
             if (plusConstructionPack != null && plusConstructionPack.hasStrongConstruction()) {
 
                 if (plusConstructionPack.hasValidAssignment()) {
-                    LOGGER.trace("Construction {}: assigned (valid)", desc);
-                    consumer.onAssigned(key, desc);
+                    if (zeroConstructionPack != null && zeroConstructionPack.hasValidAssignment()) {
+                        LOGGER.trace("Construction {}: unchanged (valid) + assigned (valid)", desc);
+                        consumer.onUnchangedValid(key, desc);
+                    } else {
+                        LOGGER.trace("Construction {}: assigned (valid)", desc);
+                        consumer.onAssigned(key, desc);
+                    }
                 } else if (zeroConstructionPack != null && zeroConstructionPack.hasValidAssignment()) {
                     LOGGER.trace("Construction {}: unchanged (valid) + assigned (invalid)", desc);
                     consumer.onUnchangedValid(key, desc);