Quantcast

svn commit: r1792136 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

svn commit: r1792136 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java

markt
Author: markt
Date: Thu Apr 20 19:35:05 2017
New Revision: 1792136

URL: http://svn.apache.org/viewvc?rev=1792136&view=rev
Log:
No functional change
Align with 9.0.x

Modified:
    tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java

Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1792136&r1=1792135&r2=1792136&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java Thu Apr 20 19:35:05 2017
@@ -89,7 +89,7 @@ import org.apache.tomcat.util.res.String
  * @author Craig R. McClanahan
  */
 public abstract class AuthenticatorBase extends ValveBase
-implements Authenticator, RegistrationListener {
+        implements Authenticator, RegistrationListener {
 
     private static final Log log = LogFactory.getLog(AuthenticatorBase.class);
 
@@ -457,7 +457,7 @@ implements Authenticator, RegistrationLi
 
         // The Servlet may specify security constraints through annotations.
         // Ensure that they have been processed before constraints are checked
-        Wrapper wrapper = request.getMappingData().wrapper;
+        Wrapper wrapper = request.getWrapper();
         if (wrapper != null) {
             wrapper.servletSecurityAnnotationScan();
         }
@@ -559,7 +559,7 @@ implements Authenticator, RegistrationLi
 
             if (jaspicProvider == null && !doAuthenticate(request, response) ||
                     jaspicProvider != null &&
-                    !authenticateJaspic(request, response, jaspicState, false)) {
+                            !authenticateJaspic(request, response, jaspicState, false)) {
                 if (log.isDebugEnabled()) {
                     log.debug(" Failed authenticate() test");
                 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Loading...