From 1344608673964c782d54a8e984e38da4e8d8b6c9 Mon Sep 17 00:00:00 2001
From: lskublik <lskublik@evolveum.com>
Date: Mon, 16 Mar 2020 12:17:49 +0100
Subject: [PATCH] adding checking of condition during adding of trigger for
 existence (MID-6040)

---
 .../model/impl/lens/projector/mappings/MappingEvaluator.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java
index 26ebc7822a9..89d532ffc1b 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/MappingEvaluator.java
@@ -494,7 +494,7 @@ public <V extends PrismValue, D extends ItemDefinition, T extends ObjectType, F
         for (MappingImpl<V,D> mapping: mappings) {
             XMLGregorianCalendar mappingNextRecomputeTime = mapping.getNextRecomputeTime();
             if (mappingNextRecomputeTime != null) {
-                if (nextRecomputeTime == null || nextRecomputeTime.compare(mappingNextRecomputeTime) == DatatypeConstants.GREATER) {
+                if (mapping.isSatisfyCondition() && (nextRecomputeTime == null || nextRecomputeTime.compare(mappingNextRecomputeTime) == DatatypeConstants.GREATER)) {
                     nextRecomputeTime = mappingNextRecomputeTime;
                     // TODO: maybe better description? But consider storage requirements. We do not want to store too much.
                     triggerOriginDescription = mapping.getIdentifier();