[tomcat] branch master updated: Polish

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new 6744132  Polish
6744132 is described below

commit 67441328b40f267312f6becd36ff732416e2e624
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 27 22:06:18 2019 +0100

    Polish
---
 java/org/apache/catalina/authenticator/AuthenticatorBase.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 8fbfea1..92cb4e2 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -549,8 +549,8 @@ public abstract class AuthenticatorBase extends ValveBase
                     
request.getCoyoteRequest().getMimeHeaders().getValue("authorization") != null;
         }
 
-        if (!authRequired && context.getPreemptiveAuthentication()
-                && 
HttpServletRequest.CLIENT_CERT_AUTH.equals(getAuthMethod())) {
+        if (!authRequired && context.getPreemptiveAuthentication() &&
+                HttpServletRequest.CLIENT_CERT_AUTH.equals(getAuthMethod())) {
             X509Certificate[] certs = getRequestCertificates(request);
             authRequired = certs != null && certs.length > 0;
         }
@@ -1064,8 +1064,8 @@ public abstract class AuthenticatorBase extends ValveBase
 
             // Configure httpOnly on SSO cookie using same rules as session
             // cookies
-            if 
(request.getServletContext().getSessionCookieConfig().isHttpOnly()
-                    || request.getContext().getUseHttpOnly()) {
+            if 
(request.getServletContext().getSessionCookieConfig().isHttpOnly() ||
+                    request.getContext().getUseHttpOnly()) {
                 cookie.setHttpOnly(true);
             }
 
@@ -1259,4 +1259,4 @@ public abstract class AuthenticatorBase extends ValveBase
         public MessageInfo messageInfo = null;
         public ServerAuthContext serverAuthContext = null;
     }
-}
\ No newline at end of file
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org