Repository: commons-scxml Updated Branches: refs/heads/master 5de358aad -> b39a4adf6
SCXML-266 SCXMLSemantics#matchTransition - code flow bug Project: http://git-wip-us.apache.org/repos/asf/commons-scxml/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-scxml/commit/b39a4adf Tree: http://git-wip-us.apache.org/repos/asf/commons-scxml/tree/b39a4adf Diff: http://git-wip-us.apache.org/repos/asf/commons-scxml/diff/b39a4adf Branch: refs/heads/master Commit: b39a4adf6f31875e375435ca720a8d2e06ebcc53 Parents: 5de358a Author: Ate Douma <[email protected]> Authored: Sun Dec 10 18:04:41 2017 +0100 Committer: Ate Douma <[email protected]> Committed: Sun Dec 10 18:04:41 2017 +0100 ---------------------------------------------------------------------- src/changes/changes.xml | 5 ++++- .../org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java | 5 +++-- src/test/java/org/apache/commons/scxml2/w3c/tests.xml | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/b39a4adf/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 4c62ec4..f3b03ae 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -35,11 +35,14 @@ <release version="2.0" date="In Git master" description="Latest unreleased code"> + <action dev="ate" type="fix" issue="SCXML-266"> + [12-10-2017] SCXMLSemantics#matchTransition - code flow bug + </action> + <action dev="ate" type="add" issue="SCXML-265"> [12-10-2017] Support <invoke> namelist attribute </action> - <action dev="ate" type="add" issue="SCXML-264"> [12-10-2017] Support <invoke> with inline (<content> body) SCXML statemachine definition </action> http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/b39a4adf/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java b/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java index 4e476c2..a860d0f 100644 --- a/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java +++ b/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java @@ -690,9 +690,10 @@ public class SCXMLSemanticsImpl implements SCXMLSemantics { boolean eventMatch = false; for (String event : transition.getEvents()) { if (eventName.startsWith(event)) { - if (eventName.length() == event.length() || eventName.charAt(event.length())=='.') + if (eventName.length() == event.length() || eventName.charAt(event.length())=='.') { eventMatch = true; - break; + break; + } } } if (!eventMatch) { http://git-wip-us.apache.org/repos/asf/commons-scxml/blob/b39a4adf/src/test/java/org/apache/commons/scxml2/w3c/tests.xml ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/scxml2/w3c/tests.xml b/src/test/java/org/apache/commons/scxml2/w3c/tests.xml index 6efb288..4a64872 100644 --- a/src/test/java/org/apache/commons/scxml2/w3c/tests.xml +++ b/src/test/java/org/apache/commons/scxml2/w3c/tests.xml @@ -31,7 +31,7 @@ <test id="417" mandatory="true" manual="false" jexl="true" ecma="true"/> <test id="419" mandatory="true" manual="false" jexl="true" ecma="true"/> <test id="421" mandatory="true" manual="false" jexl="true" ecma="true"/> - <test id="422" mandatory="true" manual="false" jexl="false" ecma="false"/> + <test id="422" mandatory="true" manual="false" jexl="true" ecma="true"/> <test id="423" mandatory="true" manual="false" jexl="true" ecma="true"/> <test id="503" mandatory="true" manual="false" jexl="true" ecma="true"/> <test id="504" mandatory="true" manual="false" jexl="true" ecma="true"/>
