[tomcat] 03/03: Simplify duplicated logic Reported by SpotBugs

[markt]

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

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

commit be1452cfafcb15303a856152d4b3deab761834eb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 21 15:01:34 2018 +0000

    Simplify duplicated logic
    Reported by SpotBugs
    
    git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1847116 
13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/tomcat/util/net/SSLUtilBase.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java 
b/java/org/apache/tomcat/util/net/SSLUtilBase.java
index c7a23e2..beb6fd4 100644
--- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
+++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
@@ -112,8 +112,7 @@ public abstract class SSLUtilBase implements SSLUtil {
         this.enabledProtocols = enabledProtocols.toArray(new 
String[enabledProtocols.size()]);
 
         if (enabledProtocols.contains(Constants.SSL_PROTO_TLSv1_3) &&
-                (sslHostConfig.getCertificateVerification() == 
CertificateVerification.OPTIONAL ||
-                        sslHostConfig.getCertificateVerification() == 
CertificateVerification.OPTIONAL) &&
+                sslHostConfig.getCertificateVerification() == 
CertificateVerification.OPTIONAL &&
                 !isTls13RenegAuthAvailable() && warnTls13) {
             log.warn(sm.getString("jsse.tls13.auth"));
         }


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