[java-identity-provider COMMIT] /trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction....

[noreply at shibboleth.net]

Author: scantor
Date: Mon Nov  4 20:27:27 2013
New Revision: 4930

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4930&view=rev
Log:
Default reset of error state between validation attempts.

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java?rev=4930&r1=4929&r2=4930&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java Mon Nov  4 20:27:27 2013
@@ -69,6 +69,9 @@
     /** Track whether custom principals have been explicitly set (including the empty set). */
     private boolean principalsAdded;
     
+    /** Indicates whether to clear any existing {@link AuthenticationErrorContext} before execution. */
+    private boolean clearErrorContext;
+    
     /** Error messages associated with a specific error condition token. */
     @Nonnull @NonnullElements private Map<String,Collection<String>> classifiedMessages;
     
@@ -80,6 +83,7 @@
         super();
 
         authenticatedSubject = new Subject();
+        clearErrorContext = true;
         classifiedMessages = Collections.emptyMap();
     }
 
@@ -199,6 +203,10 @@
             return false;
         }
         
+        if (clearErrorContext) {
+            authenticationContext.removeSubcontext(AuthenticationErrorContext.class);
+        }
+        
         return true;
     }