Bringing result and task to synchronization policy condition scripts.

(cherry picked from commit 3ee7012)
Evolveum · Oct 10, 2016 · 7853321 · 7853321
1 parent 0cc540f
commit 7853321
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/...-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java b/...-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
@@ -26,6 +26,7 @@
 
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.model.impl.expr.ModelExpressionThreadLocalHolder;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
 import org.jetbrains.annotations.NotNull;
@@ -430,10 +431,16 @@ private Boolean evaluateSynchronizationPolicyCondition(ObjectSynchronizationType
 		String desc = "condition in object synchronization " + synchronizationPolicy.getName();
 		ExpressionVariables variables = Utils.getDefaultExpressionVariables(null, currentShadow, null,
 				resource, configuration, null);
-		PrismPropertyValue<Boolean> evaluateCondition = ExpressionUtil.evaluateCondition(variables,
-				conditionExpressionType, expressionFactory, desc, task, result);
-		return evaluateCondition.getValue();
-
+		try {
+			ModelExpressionThreadLocalHolder.pushCurrentTask(task);
+			ModelExpressionThreadLocalHolder.pushCurrentResult(result);
+			PrismPropertyValue<Boolean> evaluateCondition = ExpressionUtil.evaluateCondition(variables,
+					conditionExpressionType, expressionFactory, desc, task, result);
+			return evaluateCondition.getValue();
+		} finally {
+			ModelExpressionThreadLocalHolder.popCurrentResult();
+			ModelExpressionThreadLocalHolder.popCurrentTask();
+		}
 	}
 
 	private boolean isLogDebug(ResourceObjectShadowChangeDescription change) {