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 B5295176E6 for ; Sat, 11 Oct 2014 11:07:06 +0000 (UTC) Received: (qmail 12317 invoked by uid 500); 11 Oct 2014 11:07:06 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 12249 invoked by uid 500); 11 Oct 2014 11:07:06 -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 12230 invoked by uid 99); 11 Oct 2014 11:07:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Oct 2014 11:07:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Oct 2014 11:06:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B853F23889BB; Sat, 11 Oct 2014 11:06:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1631037 - /commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java Date: Sat, 11 Oct 2014 11:06:42 -0000 To: commits@commons.apache.org From: ate@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141011110642.B853F23889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ate Date: Sat Oct 11 11:06:42 2014 New Revision: 1631037 URL: http://svn.apache.org/r1631037 Log: SCXML-211: fix for bug in current SCXML specification for addDescendantStatesToEnter algorithm Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java?rev=1631037&r1=1631036&r2=1631037&view=diff ============================================================================== --- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java (original) +++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/semantics/SCXMLSemanticsImpl.java Sat Oct 11 11:06:42 2014 @@ -476,11 +476,15 @@ public class SCXMLSemanticsImpl implemen step.getDefaultHistoryTransitions().put(h.getParent(), h.getTransition()); for (TransitionTarget dtt : h.getTransition().getTargets()) { addDescendantStatesToEnter(exctx, step, dtt); + } + for (TransitionTarget dtt : h.getTransition().getTargets()) { addAncestorStatesToEnter(exctx, step, dtt, tt.getParent()); } } else { for (TransitionTarget dtt : lastConfiguration) { addDescendantStatesToEnter(exctx, step, dtt); + } + for (TransitionTarget dtt : lastConfiguration) { addAncestorStatesToEnter(exctx, step, dtt, tt.getParent()); } } @@ -499,6 +503,8 @@ public class SCXMLSemanticsImpl implemen step.getDefaultEntrySet().add(es); for (TransitionTarget dtt : ((State)es).getInitial().getTransition().getTargets()) { addDescendantStatesToEnter(exctx, step, dtt); + } + for (TransitionTarget dtt : ((State)es).getInitial().getTransition().getTargets()) { addAncestorStatesToEnter(exctx, step, dtt, tt); } }