[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/views/error.vm

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct  6 23:13:39 2014
New Revision: 6644

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6644&view=rev
Log:
Override HTTP status for errors.

Modified:
    trunk/idp-conf/src/main/resources/views/error.vm

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=6644&r1=6643&r2=6644&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/error.vm (original)
+++ trunk/idp-conf/src/main/resources/views/error.vm Mon Oct  6 23:13:39 2014
@@ -9,7 +9,7 @@
 
 #if ($flowRequestContext)
     #set ($eventId = $flowRequestContext.getCurrentEvent().getId())
-    #set ($springContext = $flowRequestContext.getFlowExecutionContext().getActiveSession().getDefinition().getApplicationContext())
+    #set ($springContext = $flowRequestContext.getActiveFlow().getApplicationContext())
     #set ($locale = $flowRequestContext.getExternalContext().getLocale())
     #set ($eventKey = $springContext.getMessage($eventId, null, "error", $locale))
     #set ($titleSuffix = $springContext.getMessage("${eventKey}.title", null, "Error", $locale))
@@ -17,6 +17,10 @@
     
     #if ($eventId == "AccessDenied")
         $response.setStatus(403)
+    #elseif ($eventId == "UnableToDecode")
+        $response.setStatus(400)
+    #else
+        $response.setStatus(500)
     #end
 #elseif ($exception)
     #set ($eventId = $exception.getClass().getSimpleName())