[463226] Report runtime errors back through EvaluationException

Bug: 463226
Change-Id: Id0358cc3181a7bf701f30e8ff560478c2704b681
Signed-off-by: Cedric Brun <cedric.brun@obeo.fr>

1 files changed, 4 insertions, 0 deletions

diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java
index 6ecdeb8645..84f8a87b69 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql/src/org/eclipse/sirius/common/acceleo/aql/business/internal/AQLSiriusInterpreter.java
@@ -37,6 +37,7 @@ import org.eclipse.acceleo.query.validation.type.EClassifierType;
 import org.eclipse.acceleo.query.validation.type.IType;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EStructuralFeature.Setting;
@@ -184,6 +185,9 @@ public class AQLSiriusInterpreter extends AcceleoAbstractInterpreter {
             build = parsedExpressions.get(expression);
             IQueryEvaluationEngine evaluationEngine = QueryEvaluation.newEngine(queryEnvironment);
             EvaluationResult evalResult = evaluationEngine.eval(build, variables);
+            if (evalResult.getDiagnostic().getSeverity() == Diagnostic.ERROR) {
+                throw new EvaluationException(evalResult.getDiagnostic().getMessage(), evalResult.getDiagnostic().getException());
+            }
             return evalResult.getResult();
         } catch (ExecutionException e) {
             throw new EvaluationException(e.getCause());