[java-identity-provider] branch master updated: Fix double iteration in error handling.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=442a08d5afbe30c78b6d5ef0b647ca8004e1e5a2

The following commit(s) were added to refs/heads/master by this push:
       new  442a08d   Fix double iteration in error handling.
442a08d is described below

commit 442a08d5afbe30c78b6d5ef0b647ca8004e1e5a2
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Aug 12 14:31:35 2019 -0400

    Fix double iteration in error handling.
---
 idp-conf/src/main/resources/views/login-error.vm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/idp-conf/src/main/resources/views/login-error.vm b/idp-conf/src/main/resources/views/login-error.vm
index 44676b3..224976b 100644
--- a/idp-conf/src/main/resources/views/login-error.vm
+++ b/idp-conf/src/main/resources/views/login-error.vm
@@ -2,11 +2,13 @@
 ##
 ## authenticationErrorContext - context containing error data, if available
 ##
-#if ($authenticationErrorContext && $authenticationErrorContext.getClassifiedErrors().size() > 0 && $authenticationErrorContext.getClassifiedErrors().iterator().next() != "ReselectFlow")
+#if ($authenticationErrorContext && $authenticationErrorContext.getClassifiedErrors().size() > 0)
     ## This handles errors that are classified by the message maps in the authentication config.
     #set ($eventId = $authenticationErrorContext.getClassifiedErrors().iterator().next())
-    #set ($eventKey = $springMacroRequestContext.getMessage("$eventId", "login"))
-    #set ($message = $springMacroRequestContext.getMessage("${eventKey}.message", "Login Failure: $eventId"))
+    #if ($eventId != "ReselectFlow")
+        #set ($eventKey = $springMacroRequestContext.getMessage("$eventId", "login"))
+        #set ($message = $springMacroRequestContext.getMessage("${eventKey}.message", "Login Failure: $eventId"))
+    #end
 #elseif ($authenticationErrorContext && $authenticationErrorContext.getExceptions().size() > 0)
     ## This handles login exceptions that are left unclassified.
     #set ($loginException = $authenticationErrorContext.getExceptions().get(0))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.