Fix for MID-4198, second round.

Evolveum · Oct 20, 2017 · 2018242 · 2018242
1 parent 90a7dea
commit 2018242
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 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
@@ -374,12 +374,10 @@ public void onUnchangedInvalid(ResourceShadowDiscriminator rat, String desc) {
 					if (projectionContext == null) {
 						if (processOnlyExistingProjCxts) {
 							LOGGER.trace("Projection {} skip: unchanged (invalid), processOnlyExistingProjCxts", desc);
-							return;
+						} else {
+							LOGGER.trace("Projection {} skip: unchanged (invalid) and does not exist in current lens context", desc);
 						}
-						// The projection should exist before the change but it does not
-						// This happens during reconciliation if there is an inconsistency.
-						// Pretend that the assignment was just added. That should do.
-						projectionContext = LensUtil.getOrCreateProjectionContext(context, rat);
+						return;
 					}
 					LOGGER.trace("Projection {} illegal: unchanged (invalid)", desc);
 					projectionContext.setLegal(false);

diff --git a/...-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.java b/...-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.java
@@ -1806,7 +1806,7 @@ public void test250JackAssignFocusExistsResource() throws Exception {
 	/**
 	 * MID-4198 "Disabled assignments project value in certain cases"
 	 */
-	@Test(enabled = false)
+	@Test
 	public void test252RecomputeJack() throws Exception {
 		final String TEST_NAME = "test252RecomputeJack";
 		displayTestTitle(TEST_NAME);
@@ -1836,7 +1836,7 @@ public void test252RecomputeJack() throws Exception {
 	/**
 	 * MID-4198 "Disabled assignments project value in certain cases"
 	 */
-	@Test(enabled = false)
+	@Test
 	public void test254ReconcileJack() throws Exception {
 		final String TEST_NAME = "test254ReconcileJack";
 		displayTestTitle(TEST_NAME);