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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Apr 28 13:20:53 2014
New Revision: 5783

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5783&view=rev
Log:
Fix to error handling, untested.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-conf/src/main/resources/views/error.vm

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=5783&r1=5782&r2=5783&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 Mon Apr 28 13:20:53 2014
@@ -136,7 +136,6 @@
     <end-state id="error" view="error">
         <on-entry>
             <evaluate expression="flowRequestContext.getConversationScope().get('org.opensaml.profile.context.ProfileRequestContext')" result="requestScope.profileRequestContext" />
-            <evaluate expression="profileRequestContext.getSubcontext(T(org.opensaml.profile.context.ErrorEventContext))" result="requestScope.errorEventContext" />
             <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="requestScope.encoder" />
         </on-entry>
     </end-state>

Modified: trunk/idp-conf/src/main/resources/views/error.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/error.vm?rev=5783&r1=5782&r2=5783&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/error.vm (original)
+++ trunk/idp-conf/src/main/resources/views/error.vm Mon Apr 28 13:20:53 2014
@@ -11,10 +11,9 @@
     <h2>ERROR</h2>
 
     #set ($encoder = $flowRequestContext.getRequestScope().get('encoder'))
-    #set ($errorEventContext = $flowRequestContext.getRequestScope().get('errorEventContext'))
 
-    #if ( $errorEventContext && $errorEventContext.getEvent() )
-            <p>ERROR: $encoder.encodeForHTML($errorEventContext.getEvent().toString())</p>
+    #if ( $flowRequestContext.getCurrentEvent() )
+            <p>ERROR: $encoder.encodeForHTML($flowRequestContext.getCurrentEvent().getId())</p>
     #end
         
     </body>