[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml

[noreply at shibboleth.net]

Author: scantor
Date: Thu Mar  3 13:28:45 2016
New Revision: 8122

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8122&view=rev
Log:
Bit of efficiency, don't clear cookie unnecessarily.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml?rev=8122&r1=8121&r2=8122&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml	Thu Mar  3 13:28:45 2016
@@ -9,7 +9,12 @@
     <!-- If the condition is true, we don't need to notify, otherwise check cookie to see if we do. -->
     <decision-state id="CheckContext">
         <if test="ExpiringPasswordPredicate.apply(opensamlProfileRequestContext)"
-            then="UnsetCookie" else="CheckCookie" />
+            then="ShouldUnsetCookie" else="CheckCookie" />
+    </decision-state>
+
+    <decision-state id="ShouldUnsetCookie">
+        <if test="ExpiringPasswordCookieManager.getCookieValue(ExpiringPasswordCookieName, null) != null"
+            then="UnsetCookie" else="proceed" />
     </decision-state>
 
     <action-state id="UnsetCookie">