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

Evolveum · Jun 30, 2017 · bdd2cf4 · bdd2cf4
2 parents d34a9f4 + 1d569dd
commit bdd2cf4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java
@@ -22,6 +22,7 @@
 import com.evolveum.midpoint.prism.xnode.PrimitiveXNode;
 import com.evolveum.midpoint.prism.xnode.XNode;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
+import com.evolveum.midpoint.util.PrettyPrinter;
 import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ApprovalSchemaType;
@@ -41,6 +42,8 @@
 import java.util.Date;
 
 /**
+ * TODO unify with PrettyPrinter somehow
+ *
  * @author mederly
  */
 public class ValueDisplayUtil {
@@ -137,6 +140,8 @@ public static String toStringValue(PrismPropertyValue propertyValue) {
 			return String.valueOf(value);
         } else if (value instanceof byte[]) {
             return "(binary data)";
+        } else if (value instanceof RawType) {
+            return PrettyPrinter.prettyPrint(value);
         } else {
             return "(a value of type " + value.getClass().getName() + ")";  // todo i18n
         }

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
@@ -844,7 +844,7 @@ public static <F extends ObjectType> boolean evaluateIterationCondition(LensCont
 		variables.addVariableDefinition(ExpressionConstants.VAR_ITERATION_TOKEN, iterationToken);
 
 		ExpressionEvaluationContext expressionContext = new ExpressionEvaluationContext(null , variables, desc, task, result);
-		PrismValueDeltaSetTriple<PrismPropertyValue<Boolean>> outputTriple = ModelExpressionThreadLocalHolder.evaluateExpressionInContext(expression, expressionContext, task, result);
+		PrismValueDeltaSetTriple<PrismPropertyValue<Boolean>> outputTriple = ModelExpressionThreadLocalHolder.evaluateExpressionInContext(expression, expressionContext, context, null, task, result);
 		Collection<PrismPropertyValue<Boolean>> outputValues = outputTriple.getNonNegativeValues();
 		if (outputValues.isEmpty()) {
 			return false;