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
The following commit(s) were added to refs/heads/8.5.x by this push:
new 27fe45a184 Fix copy/paste error & simplify
27fe45a184 is described below
commit 27fe45a1842fd0e734e50b767d8d4c3d60d30854
Author: Mark Thomas <[email protected]>
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 ee704bd1f3..bc78d0c90e 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -379,18 +379,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: [email protected]
For additional commands, e-mail: [email protected]
