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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Nov  6 16:12:17 2015
New Revision: 7959

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7959&view=rev
Log:
IDP-791 - Correct order of initial client storage load.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml?rev=7959&r1=7958&r2=7959&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml	Fri Nov  6 16:12:17 2015
@@ -10,6 +10,18 @@
             <evaluate result="flowScope.hasAuthenticationContext" expression="false" />
         </on-entry>
         <evaluate expression="InitializeProfileRequestContext"/>
+        <evaluate expression="PopulateClientStorageLoadContext" />
+        <evaluate expression="'proceed'" />
+        <transition on="proceed" to="ClientStorageLoad" />
+        <transition on="NoLoadNeeded" to="ContinueLogin" />
+    </action-state>
+
+    <subflow-state id="ClientStorageLoad" subflow="client-storage/read">
+        <input name="calledAsSubflow" value="true" />
+        <transition on="proceed" to="ContinueLogin"/>
+    </subflow-state>
+
+    <action-state id="ContinueLogin">
         <evaluate expression="PopulateSessionContext"/>
         <evaluate expression="InitializeLogin" />
         <evaluate expression="BuildRelyingPartyContext" />
@@ -17,16 +29,9 @@
         <evaluate expression="SelectRelyingPartyConfiguration" />
         <evaluate expression="SelectProfileConfiguration" />
         <evaluate expression="PublishProtocolRequest" />
-        <evaluate expression="PopulateClientStorageLoadContext" />
         <evaluate expression="'proceed'" />
-        <transition on="proceed" to="ClientStorageLoad" />
-        <transition on="NoLoadNeeded" to="CheckAuthenticationRequired" />
+        <transition on="proceed" to="CheckAuthenticationRequired" />
     </action-state>
-
-    <subflow-state id="ClientStorageLoad" subflow="client-storage/read">
-        <input name="calledAsSubflow" value="true" />
-        <transition on="proceed" to="CheckAuthenticationRequired"/>
-    </subflow-state>
 
     <decision-state id="CheckAuthenticationRequired">
         <if test="flowScope.serviceTicketRequest.gateway"