[tomcat] branch main updated: Fix copy/paste error & simplify

[markt]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 2dcf2acc25 Fix copy/paste error & simplify
2dcf2acc25 is described below

commit 2dcf2acc254e5d9199a1f3e9a2eb2e06dd5c83de
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 14 09:10:07 2023 +0100

    Fix copy/paste error & simplify
---
 java/org/apache/tomcat/util/net/AbstractEndpoint.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 1001e5490c..13114d7552 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -426,18 +426,16 @@ public abstract class AbstractEndpoint<S,U> {
 
         if (certificate.getStoreType() == StoreType.PEM) {
             // PEM file based
-            String keySource = certificate.getCertificateKeystoreFile();
-            keySource = certificate.getCertificateKeyFile();
-            certificateInfo = sm.getString("endpoint.tls.info.cert.pem", 
keySource, certificate.getCertificateFile(),
-                    certificate.getCertificateChainFile());
+            certificateInfo = sm.getString("endpoint.tls.info.cert.pem", 
certificate.getCertificateKeyFile(),
+                    certificate.getCertificateFile(), 
certificate.getCertificateChainFile());
         } else {
             // Keystore based
-            String keyStore = certificate.getCertificateKeystoreFile();
             String keyAlias = certificate.getCertificateKeyAlias();
             if (keyAlias == null) {
                 keyAlias = SSLUtilBase.DEFAULT_KEY_ALIAS;
             }
-            certificateInfo = sm.getString("endpoint.tls.info.cert.keystore", 
keyStore, keyAlias);
+            certificateInfo =
+                    sm.getString("endpoint.tls.info.cert.keystore", 
certificate.getCertificateKeystoreFile(), keyAlias);
         }
 
         String trustStoreSource = sslHostConfig.getTruststoreFile();


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