Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E2BD2200D58 for ; Sun, 17 Dec 2017 23:59:01 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E10B2160C17; Sun, 17 Dec 2017 22:59:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0CBC8160C06 for ; Sun, 17 Dec 2017 23:59:00 +0100 (CET) Received: (qmail 10144 invoked by uid 500); 17 Dec 2017 22:59:00 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 10135 invoked by uid 99); 17 Dec 2017 22:59:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Dec 2017 22:59:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4F4B4DFF73; Sun, 17 Dec 2017 22:58:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ate@apache.org To: commits@commons.apache.org Message-Id: <2b4e27170da04383aa0e0b1e24d69399@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: commons-scxml git commit: SCXML-275 expression evaluation must fallback to empty string on error, see SCXML specification 5.6.2 Date: Sun, 17 Dec 2017 22:58:57 +0000 (UTC) archived-at: Sun, 17 Dec 2017 22:59:02 -0000 Repository: commons-scxml Updated Branches: refs/heads/master 1cc51f55d -> a55b13b7a SCXML-275 expression evaluation must fallback to empty string on error, see SCXML specification 5.6.2 Project: http://git-wip-us.apache.org/repos/asf/commons-scxml/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-scxml/commit/a55b13b7 Tree: http://git-wip-us.apache.org/repos/asf/commons-scxml/tree/a55b13b7 Diff: http://git-wip-us.apache.org/repos/asf/commons-scxml/diff/a55b13b7 Branch: refs/heads/master Commit: a55b13b7a0aa77d3e194563126f22db057873142 Parents: 1cc51f5 Author: Ate Douma Authored: Sun Dec 17 23:52:45 2017 +0100 Committer: Ate Douma Committed: Sun Dec 17 23:52:45 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/commons/scxml2/model/Final.java | 13 ++++++++++++- .../org/apache/commons/scxml2/model/Invoke.java | 11 ++++++++++- .../java/org/apache/commons/scxml2/model/Send.java | 16 +++++++++++++++- 3 files changed, 37 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/a55b13b7/src/main/java/org/apache/commons/scxml2/model/Final.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/scxml2/model/Final.java b/src/main/java/org/apache/commons/scxml2/model/Final.java index 28a8063..04aaa16 100644 --- a/src/main/java/org/apache/commons/scxml2/model/Final.java +++ b/src/main/java/org/apache/commons/scxml2/model/Final.java @@ -90,7 +90,18 @@ public class Final extends EnterableState { Context ctx = exctx.getScInstance().getGlobalContext(); if (content != null) { if (content.getExpr() != null) { - result = eval.cloneData(eval.eval(ctx, content.getExpr())); + Object evalResult = null; + try { + evalResult = eval.eval(ctx, content.getExpr()); + } catch (SCXMLExpressionException e) { + exctx.getInternalIOProcessor().addEvent(new EventBuilder(TriggerEvent.ERROR_EXECUTION, + TriggerEvent.ERROR_EVENT).build()); + exctx.getErrorReporter().onError(ErrorConstants.EXPRESSION_ERROR, + "Failed to evaluate expression due to error: "+ e.getMessage() + + ", Using empty value instead.", getParent()); + evalResult = ""; + } + result = eval.cloneData(evalResult); } else if (content.getValue() != null) { result = content.getValue(); } http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/a55b13b7/src/main/java/org/apache/commons/scxml2/model/Invoke.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/scxml2/model/Invoke.java b/src/main/java/org/apache/commons/scxml2/model/Invoke.java index b7ccf37..a4a0d21 100644 --- a/src/main/java/org/apache/commons/scxml2/model/Invoke.java +++ b/src/main/java/org/apache/commons/scxml2/model/Invoke.java @@ -401,7 +401,16 @@ public class Invoke extends Action implements ContentContainer, ParamsContainer Object contentValue = null; if (src == null && content != null) { if (content.getExpr() != null) { - contentValue = eval.eval(ctx, content.getExpr()); + try { + contentValue = eval.eval(ctx, content.getExpr()); + } catch (SCXMLExpressionException e) { + exctx.getInternalIOProcessor().addEvent(new EventBuilder(TriggerEvent.ERROR_EXECUTION, + TriggerEvent.ERROR_EVENT).build()); + exctx.getErrorReporter().onError(ErrorConstants.EXPRESSION_ERROR, + "Failed to evaluate expression due to error: "+ e.getMessage() + + ", Using empty value instead.", getParent()); + contentValue = ""; + } } else if (content.getValue() != null) { contentValue = content.getValue(); } http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/a55b13b7/src/main/java/org/apache/commons/scxml2/model/Send.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/scxml2/model/Send.java b/src/main/java/org/apache/commons/scxml2/model/Send.java index 1ff8a7c..f38a0b4 100644 --- a/src/main/java/org/apache/commons/scxml2/model/Send.java +++ b/src/main/java/org/apache/commons/scxml2/model/Send.java @@ -24,9 +24,12 @@ import java.util.Map; import org.apache.commons.scxml2.ActionExecutionContext; import org.apache.commons.scxml2.Context; import org.apache.commons.scxml2.Evaluator; +import org.apache.commons.scxml2.EventBuilder; import org.apache.commons.scxml2.SCXMLExpressionException; import org.apache.commons.scxml2.SCXMLIOProcessor; import org.apache.commons.scxml2.SCXMLSystemContext; +import org.apache.commons.scxml2.TriggerEvent; +import org.apache.commons.scxml2.semantics.ErrorConstants; /** * The class in this SCXML object model that corresponds to the @@ -431,7 +434,18 @@ public class Send extends Action implements ContentContainer, ParamsContainer { } else if (content != null) { if (content.getExpr() != null) { - payload = eval.cloneData(eval.eval(ctx, content.getExpr())); + Object evalResult = null; + try { + evalResult = eval.eval(ctx, content.getExpr()); + } catch (SCXMLExpressionException e) { + exctx.getInternalIOProcessor().addEvent(new EventBuilder(TriggerEvent.ERROR_EXECUTION, + TriggerEvent.ERROR_EVENT).build()); + exctx.getErrorReporter().onError(ErrorConstants.EXPRESSION_ERROR, + "Failed to evaluate expression due to error: "+ e.getMessage() + + ", Using empty value instead.", getParent()); + evalResult = ""; + } + payload = eval.cloneData(evalResult); } else if (content.getValue() != null) { payload = content.getValue(); }