You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/06/14 08:10:31 UTC
[tomcat] branch 9.0.x updated: Fix copy/paste error & simplify
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new b0f0377b47 Fix copy/paste error & simplify
b0f0377b47 is described below
commit b0f0377b475aef2542f19ea606fdc248c08fba21
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 fd3278d51e..44a288ad79 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -381,18 +381,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org