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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep  8 21:07:05 2015
New Revision: 7734

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7734&view=rev
Log:
IDP-807 - error.vm sends 500(internal server error) for common (client) 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=7734&r1=7733&r2=7734&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/error.vm	(original)
+++ trunk/idp-conf/src/main/resources/views/error.vm	Tue Sep  8 21:07:05 2015
@@ -20,10 +20,12 @@
     #set ($message = $springMacroRequestContext.getMessage("${eventKey}.message", "$defaultTitleSuffix: $eventId"))
     #if ($eventId == "AccessDenied" or $eventId == "ContextCheckDenied")
         $response.setStatus(403)
-    #elseif ($eventId == "UnableToDecode" || $eventId == "InvalidMessage")
+    #elseif ($eventId == "AttributeReleaseRejected" || $eventId == "TermsRejected")
+        $response.setStatus(200)
+    #elseif ($eventKey == "unexpected" || $eventKey == "runtime-error" || $eventKey == "error")
+        $response.setStatus(500)
+    #else
         $response.setStatus(400)
-    #else
-        $response.setStatus(500)
     #end
 #elseif ($exception)
 	## This handles exceptions that reach the Spring-MVC exception handler.