diff --git a/model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java b/model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java index 05ecd72f71d..8767dacd187 100644 --- a/model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java +++ b/model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java @@ -209,8 +209,10 @@ public static Object resolvePath(ItemPath path, ExpressionVariables variables, O if (root instanceof ObjectReferenceType) { root = resolveReference((ObjectReferenceType)root, objectResolver, varDesc, shortDesc, result); } - - if (root instanceof PrismObject) { + + if (root instanceof Objectable) { + return (((Objectable) root).asPrismObject()).find(relativePath); + } if (root instanceof PrismObject) { return ((PrismObject)root).find(relativePath); } else if (root instanceof PrismContainer) { return ((PrismContainer)root).find(relativePath); diff --git a/model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.xml b/model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.xml index 8284f0c9e43..3070fd7451e 100644 --- a/model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.xml +++ b/model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.xml @@ -35,10 +35,6 @@ http://midpoint.evolveum.com/xml/ns/public/model/synchronization/task/reconciliation/handler-3 - recurring - tight - - 5 - + single diff --git a/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java b/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java index 544e26c1108..028fe776fd9 100644 --- a/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java +++ b/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 Evolveum + * Copyright (c) 2010-2014 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,7 @@ package com.evolveum.midpoint.task.api; /** - * Created with IntelliJ IDEA. - * User: mederly - * Date: 3.5.2012 - * Time: 21:50 - * To change this template use File | Settings | File Templates. + * @author mederly */ public class TaskCategory { @@ -36,4 +32,5 @@ public class TaskCategory { public static final String WORKFLOW = "Workflow"; public static final String SYSTEM = "System"; public static final String REPORT = "Report"; + public static final String CUSTOM = "Custom"; }