This is an automated email from the ASF dual-hosted git repository.
markt-asf 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 15b98c6029 Reduce code duplication
15b98c6029 is described below
commit 15b98c602947f75ee0e99d9d642899efa640c8f7
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Nov 5 13:52:34 2026 +0000
Reduce code duplication
---
java/org/apache/tomcat/util/net/AbstractEndpoint.java | 5 +----
java/org/apache/tomcat/util/net/SSLContext.java | 3 +--
java/org/apache/tomcat/util/net/SSLContextWrapper.java | 3 +--
java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java | 10 ++++++++++
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index f504efb091..56f3f3fc7b 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -527,10 +527,7 @@ public abstract class AbstractEndpoint<S, U> {
certificate.getCertificateFile(),
certificate.getCertificateChainFile());
} else {
// Keystore based
- String keyAlias = certificate.getCertificateKeyAlias();
- if (keyAlias == null) {
- keyAlias = SSLUtilBase.DEFAULT_KEY_ALIAS;
- }
+ String keyAlias = certificate.getCertificateKeyAliasOrDefault();
String keystoreFile;
if (certificate.getCertificateKeystoreInternal() != null) {
// Keystore was set directly. Original location is unknown.
diff --git a/java/org/apache/tomcat/util/net/SSLContext.java
b/java/org/apache/tomcat/util/net/SSLContext.java
index 5cb645cbc6..7adf3cbfdb 100644
--- a/java/org/apache/tomcat/util/net/SSLContext.java
+++ b/java/org/apache/tomcat/util/net/SSLContext.java
@@ -137,8 +137,7 @@ public interface SSLContext {
* @return The served alias, never {@code null}
*/
default String getServedAlias(SSLHostConfigCertificate certificate) {
- String configuredAlias = certificate.getCertificateKeyAlias();
- String alias = configuredAlias == null ? SSLUtilBase.DEFAULT_KEY_ALIAS
: configuredAlias;
+ String alias = certificate.getCertificateKeyAliasOrDefault();
for (X509KeyManager keyManager : getServerKeyManagers(certificate)) {
if (keyManager == null) {
continue;
diff --git a/java/org/apache/tomcat/util/net/SSLContextWrapper.java
b/java/org/apache/tomcat/util/net/SSLContextWrapper.java
index 5c75ad3764..d24441a4f1 100644
--- a/java/org/apache/tomcat/util/net/SSLContextWrapper.java
+++ b/java/org/apache/tomcat/util/net/SSLContextWrapper.java
@@ -92,8 +92,7 @@ class SSLContextWrapper implements SSLContext {
*/
@Override
public String getServedAlias(SSLHostConfigCertificate certificate) {
- String configuredAlias = certificate.getCertificateKeyAlias();
- return configuredAlias == null ? SSLUtilBase.DEFAULT_KEY_ALIAS :
configuredAlias;
+ return certificate.getCertificateKeyAliasOrDefault();
}
@Override
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
index 464ee735e6..264719dddd 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
@@ -333,6 +333,16 @@ public class SSLHostConfigCertificate implements
Serializable {
}
+ /**
+ * Returns the configured key alias or, if none is configured, {@link
SSLUtilBase#DEFAULT_KEY_ALIAS}.
+ *
+ * @return the configured or default key alias, never {@code null}
+ */
+ public String getCertificateKeyAliasOrDefault() {
+ return certificateKeyAlias == null ? SSLUtilBase.DEFAULT_KEY_ALIAS :
certificateKeyAlias;
+ }
+
+
/**
* Sets the path to the keystore file.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
