fixing "execution environment" for conditions in provisoning scritps.

Evolveum · Jun 8, 2017 · bd5be70 · bd5be70
1 parent 5425657
commit bd5be70
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
@@ -33,6 +33,7 @@
 import com.evolveum.midpoint.model.api.ProgressInformation;
 import com.evolveum.midpoint.model.api.context.SynchronizationPolicyDecision;
 import com.evolveum.midpoint.model.impl.ModelObjectResolver;
+import com.evolveum.midpoint.model.impl.expr.ExpressionEnvironment;
 import com.evolveum.midpoint.model.impl.expr.ModelExpressionThreadLocalHolder;
 import com.evolveum.midpoint.model.impl.lens.projector.FocusConstraintsChecker;
 import com.evolveum.midpoint.model.impl.lens.projector.PolicyRuleProcessor;
@@ -1426,7 +1427,12 @@ private <F extends ObjectType, T extends ObjectType> OperationProvisioningScript
 
 		ExpressionVariables variables = Utils.getDefaultExpressionVariables(user, resourceObject, discr,
 				resource.asPrismObject(), context.getSystemConfiguration(), objectContext);
-		return evaluateScript(resourceScripts, discr, operation, null, variables, context, objectContext, task, result);
+		ModelExpressionThreadLocalHolder.pushExpressionEnvironment(new ExpressionEnvironment<>(task, result));
+		try {
+			return evaluateScript(resourceScripts, discr, operation, null, variables, context, objectContext, task, result);
+		} finally {
+			ModelExpressionThreadLocalHolder.popExpressionEnvironment();
+		}
 
 	}