fix for MID-7948, checking object reference is it's not empty before …

…validation
Evolveum · Aug 31, 2022 · 692a565 · 692a565
1 parent 30f5d16
commit 692a565
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionValidator.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionValidator.java
@@ -10,6 +10,7 @@
 
 import com.evolveum.midpoint.prism.PrismContext;
 
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.validation.INullAcceptingValidator;
 import org.apache.wicket.validation.IValidatable;
@@ -83,6 +84,9 @@ public void validate(IValidatable<T> validatable) {
         }
         ExpressionVariables variables = new ExpressionVariables();
         Class typeClass = (valueToValidate == null ? String.class : valueToValidate.getClass());
+        if (valueToValidate instanceof ObjectReferenceType && ((ObjectReferenceType) valueToValidate).asReferenceValue().isEmpty()) {
+            valueToValidate = null;
+        }
         variables.put(ExpressionConstants.VAR_INPUT, valueToValidate, typeClass);
         variables.putObject(ExpressionConstants.VAR_OBJECT, (ObjectType)getObjectType(), ObjectType.class);
         ExpressionEvaluationContext context = new ExpressionEvaluationContext(null, variables, contextDesc, task);