Fixing weak construction (MID-3662)

Evolveum · Jan 18, 2017 · 13ef291 · 13ef291
1 parent 6143293
commit 13ef291
Show file tree

Hide file tree

Showing 4 changed files with 729 additions and 13 deletions.
diff --git a/...pl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java b/...pl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
@@ -659,7 +659,8 @@ private <F extends FocusType> void processAssignmentsProjectionsWithFocus(LensCo
                 projectionContext.setAssignedOld(true);
 
             // SITUATION: The projection is both ASSIGNED and UNASSIGNED
-            } else if (constructionMapTriple.getPlusMap().containsKey(rat) && constructionMapTriple.getMinusMap().containsKey(rat)) {
+            } else if (constructionMapTriple.getPlusMap().containsKey(rat) && constructionMapTriple.getMinusMap().containsKey(rat) && 
+            		plusConstructionPack.hasStrongConstruction()) {
             	// Account was removed and added in the same operation. This is the case if e.g. one role is
             	// removed and another is added and they include the same account.
             	// Keep original account state