Commit 079aa5e8 authored by Robert Zenz's avatar Robert Zenz

Fixed that exceptions might close the UI.

parent 8952991c
......@@ -203,12 +203,16 @@ public class Evaluator {
parameters = Arrays.asList(parametersList.split("\\s*,\\s*"));
}
return new FunctionEvaluatedExpression(
functionMatcher.group("ID"),
preProcessedExpression,
parameters,
functionMatcher.group("EXPRESSION"),
prepareExpression(functionMatcher.group("EXPRESSION")).isBoolean());
try {
return new FunctionEvaluatedExpression(
functionMatcher.group("ID"),
preProcessedExpression,
parameters,
functionMatcher.group("EXPRESSION"),
prepareExpression(functionMatcher.group("EXPRESSION")).isBoolean());
} catch (Expression.ExpressionException e) {
throw new InvalidExpressionException(e.getMessage(), e);
}
}
String id = null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment