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 7af21f6b75 Infer KeyStore type when configuring a KeyStore directly
7af21f6b75 is described below
commit 7af21f6b75aa809c9e8e79f8f1fbffcb3b577d64
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Oct 23 17:41:34 2023 +0100
Infer KeyStore type when configuring a KeyStore directly
---
java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java | 3 +++
webapps/docs/changelog.xml | 10 ++++++++++
2 files changed, 13 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
index 0c0ebb7274..68a6d2d378 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
@@ -224,6 +224,9 @@ public class SSLHostConfigCertificate implements
Serializable {
public void setCertificateKeystore(KeyStore certificateKeystore) {
this.certificateKeystore = certificateKeystore;
+ if (certificateKeystore != null) {
+ setCertificateKeystoreType(certificateKeystore.getType());
+ }
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cccd9de7b2..34724b54a9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -126,6 +126,16 @@
</update>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <add>
+ When calling
+ <code>SSLHostConfigCertificate.setCertificateKeystore(ks)</code>,
+ automatically call
+ <code>setCertificateKeystoreType(ks.getType())</code>. (markt)
+ </add>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
