[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml

[noreply at shibboleth.net]

Author: scantor
Date: Tue Apr 29 20:12:48 2014
New Revision: 5798

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5798&view=rev
Log:
Fix error handling at start of flows.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml?rev=5798&r1=5797&r2=5798&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml Tue Apr 29 20:12:48 2014
@@ -19,17 +19,22 @@
         <evaluate expression="SelectProfileConfiguration" />
 
         <evaluate expression="PopulateSignatureValidationParameters" />
-        <evaluate expression="CheckForInboundSubflow" />
-
         <evaluate expression="'proceed'" />
         
-        <!-- proceed indicates no flow to call -->
+        <transition on="proceed" to="CheckForInboundSubflow" />
+    </action-state>
+    
+    <action-state id="CheckForInboundSubflow">
+        <evaluate expression="CheckForInboundSubflow" />
+        <evaluate expression="'proceed'" />
+        
+        <!-- No inbound flow to call. -->
         <transition on="proceed" to="OutboundContexts" />
-
-        <!-- Handle possible errors. -->
-        <transition on="#{currentEvent.id.startsWith('Invalid')}" to="SavePreviousEventAsError" />
         
-        <!-- Call a subflow with the same ID as the event. -->
+        <!-- Anything starting with Invalid is an error. -->
+        <transition on="#{currentEvent.id.startsWith('Invalid')}" to="HandleError" />
+        
+        <!-- Anything else is a subflow to call. -->
         <transition to="CallInboundSubflow" />
     </action-state>