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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Aug 15 19:40:47 2014
New Revision: 6427

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6427&view=rev
Log:
Collapse unnecessary error handling state into end-state.

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=6427&r1=6426&r2=6427&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 Fri Aug 15 19:40:47 2014
@@ -125,27 +125,19 @@
         <transition to="HandleErrorWithView" />
     </action-state>
 
-    <!-- Populates inputs to error views and dispatches based on the error event. -->
-    <action-state id="HandleErrorWithView">
+    <!-- Unsuccessful terminal state. -->
+    
+    <end-state id="HandleErrorWithView" view="#{MapEventToView.apply(currentEvent)}">
         <on-entry>
+            <evaluate expression="WriteAuditLog" />
             <evaluate expression="opensamlProfileRequestContext" result="requestScope.profileRequestContext" />
             <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="requestScope.encoder" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="requestScope.request" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="requestScope.response" />
         </on-entry>
-        
-        <evaluate expression="currentEvent" />
-        
-        <transition to="error" />
-    </action-state>
-
-    <end-state id="error" view="#{MapEventToView.apply(currentEvent)}">
-        <on-entry>
-            <evaluate expression="WriteAuditLog" />
-        </on-entry>
     </end-state>
 
-    <!-- Successful terminal state. -->
+    <!-- Successful terminal state (success meaning outbound SAML message encoded). -->
 
     <end-state id="end">
         <on-entry>