Author: rahul
Date: Sun Oct 23 11:51:03 2005
New Revision: 327834

URL: http://svn.apache.org/viewcvs?rev=327834&view=rev
Log:
Bug fix: Histories have no relevance in entry lists.

Bugs fixed in r327833 (missed a credit in that message) and this commit were 
reported by Jaroslav Gergic.

Modified:
    
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java

Modified: 
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java?rev=327834&r1=327833&r2=327834&view=diff
==============================================================================
--- 
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
 (original)
+++ 
jakarta/commons/sandbox/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
 Sun Oct 23 11:51:03 2005
@@ -775,8 +775,12 @@
         for (Iterator i = transitions.iterator(); i.hasNext();) {
             Transition t = (Transition) i.next();
             entered.addAll(t.getPath().getDownwardSegment());
+            // If target is a History pseudo state, remove from entered list
+            if (t.getRuntimeTarget() instanceof History) {
+                entered.remove(t.getRuntimeTarget());
+            }
         }
-        // Chech whether the computed state config is legal
+        // Check whether the computed state config is legal
         targetSet.addAll(residual);
         residual.clear();
         if (!SCXMLHelper.isLegalConfig(targetSet, errorReporter)) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to