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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Mar 13 23:59:59 2015
New Revision: 7416

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7416&view=rev
Log:
Guard the error view states with a dedicated exception handler.

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

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml?rev=7416&r1=7415&r2=7416&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml Fri Mar 13 23:59:59 2015
@@ -9,7 +9,7 @@
 
     <action-state id="LogRuntimeException">
         <on-entry>
-            <evaluate expression="T(org.slf4j.LoggerFactory).getLogger('net.shibboleth.idp.profile').error('Uncaught runtime exception', rootCauseException)" />
+            <evaluate expression="T(org.slf4j.LoggerFactory).getLogger('net.shibboleth.idp.profile').error('Uncaught runtime exception', flowExecutionException.getCause())" />
         </on-entry>
         <evaluate expression="'RuntimeException'" />
         <transition to="HandleErrorWithView" />
@@ -31,6 +31,7 @@
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="requestScope.request" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="requestScope.response" />
         </on-entry>
+        <exception-handler bean="RethrowingFlowExecutionExceptionHandler"/>
     </end-state>
 
     <end-state id="ErrorView" view="#{MapEventToView.apply(currentEvent)}">
@@ -41,6 +42,7 @@
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="requestScope.request" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="requestScope.response" />
         </on-entry>
+        <exception-handler bean="RethrowingFlowExecutionExceptionHandler"/>
     </end-state>
 
     <!-- Default is to turn non-proceed events into an error. -->