Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Oct 10, 2016 · a48e321 · a48e321
2 parents 670816c + 4963cbd
commit a48e321
Show file tree

Hide file tree

Showing 2 changed files with 13 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;
@@ -439,10 +440,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) {

diff --git a/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera.xml b/testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera.xml
@@ -228,6 +228,7 @@
                 <valueAttribute>ri:dn</valueAttribute>
                 <shortcutAssociationAttribute>ri:memberOf</shortcutAssociationAttribute>
             	<shortcutValueAttribute>ri:dn</shortcutValueAttribute>
+            	<explicitReferentialIntegrity>false</explicitReferentialIntegrity>
             </association>
 
             <activation>
@@ -480,6 +481,7 @@
                 <valueAttribute>ri:dn</valueAttribute>
                 <shortcutAssociationAttribute>ri:memberOf</shortcutAssociationAttribute>
             	<shortcutValueAttribute>ri:dn</shortcutValueAttribute>
+            	<explicitReferentialIntegrity>false</explicitReferentialIntegrity>
             </association>
 
             <activation>