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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov 18 15:41:49 2014
New Revision: 6938

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6938&view=rev
Log:
Trap runtime exceptions by logging and then passing on to error handling.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml?rev=6938&r1=6937&r2=6938&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml Tue Nov 18 15:41:49 2014
@@ -22,7 +22,7 @@
         <input name="calledAsSubflow" value="true" />
         <transition on="proceed" to="LogoutSucceeded" />
     </subflow-state>
-
+    
     <end-state id="LogoutSucceeded">
         <on-entry>
             <evaluate expression="WriteAuditLog" />
@@ -38,8 +38,16 @@
         </on-entry>
     </end-state>
 
+    <!-- Passthrough state if an exception is thrown. -->
+
+    <action-state id="LogRuntimeException">
+        <evaluate expression="T(org.slf4j.LoggerFactory).getLogger('net.shibboleth.idp.profile').error('Uncaught runtime exception', rootCauseException)" />
+        <transition to="LogoutFailed" />
+    </action-state>
+
     <!-- Default is to turn non-proceed events into an error. -->
     <global-transitions>
+        <transition on-exception="java.lang.RuntimeException" to="LogRuntimeException" />
         <transition on="#{!'proceed'.equals(currentEvent.id)}" to="LogoutFailed" />
     </global-transitions>