Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 33D1918FC8 for ; Mon, 28 Dec 2015 20:45:38 +0000 (UTC) Received: (qmail 41937 invoked by uid 500); 28 Dec 2015 20:45:38 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 41854 invoked by uid 500); 28 Dec 2015 20:45:37 -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 41845 invoked by uid 99); 28 Dec 2015 20:45:37 -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; Mon, 28 Dec 2015 20:45:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AD398E03CD; Mon, 28 Dec 2015 20:45:37 +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 Date: Mon, 28 Dec 2015 20:45:38 -0000 Message-Id: <023cce50e70c42f6a2fb1a2c8b1c4f2f@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] commons-scxml git commit: Javascript conditional expressions must be evaluated as (converted to) effective boolean expression Javascript conditional expressions must be evaluated as (converted to) effective boolean expression Project: http://git-wip-us.apache.org/repos/asf/commons-scxml/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-scxml/commit/4f0841e0 Tree: http://git-wip-us.apache.org/repos/asf/commons-scxml/tree/4f0841e0 Diff: http://git-wip-us.apache.org/repos/asf/commons-scxml/diff/4f0841e0 Branch: refs/heads/master Commit: 4f0841e04d88db62129618493ff85b87efec7712 Parents: b24e7f3 Author: Ate Douma Authored: Mon Dec 28 21:45:01 2015 +0100 Committer: Ate Douma Committed: Mon Dec 28 21:45:01 2015 +0100 ---------------------------------------------------------------------- .../commons/scxml2/env/javascript/JSEvaluator.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/4f0841e0/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java b/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java index aa0a744..a901136 100644 --- a/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java +++ b/src/main/java/org/apache/commons/scxml2/env/javascript/JSEvaluator.java @@ -188,17 +188,7 @@ public class JSEvaluator extends AbstractBaseEvaluator { */ @Override public Boolean evalCond(Context context, String expression) throws SCXMLExpressionException { - final Object result = eval(context, expression); - - if (result == null) { - return Boolean.FALSE; - } - - if (result instanceof Boolean) { - return (Boolean)result; - } - - throw new SCXMLExpressionException("Invalid boolean expression: " + expression); + return (Boolean)eval(context, "Boolean("+expression+")"); } /**