This is an automated email from the ASF dual-hosted git repository.
remm 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 740530dbeb getAcceptedIssuers must not return null
740530dbeb is described below
commit 740530dbebba7c77862c69827efb70bda189febf
Author: remm <[email protected]>
AuthorDate: Tue Sep 19 14:57:12 2023 +0200
getAcceptedIssuers must not return null
As per the javadoc.
Found indirectly by coverity.
---
.../catalina/tribes/membership/cloud/AbstractStreamProvider.java | 2 +-
java/org/apache/tomcat/util/net/jsse/JSSESSLContext.java | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
index 5996113496..a1e9ab5609 100644
---
a/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
+++
b/java/org/apache/catalina/tribes/membership/cloud/AbstractStreamProvider.java
@@ -54,7 +54,7 @@ public abstract class AbstractStreamProvider implements
StreamProvider {
public void checkServerTrusted(X509Certificate[] chain, String
authType) throws CertificateException {}
@Override
public X509Certificate[] getAcceptedIssuers() {
- return null;
+ return new X509Certificate[0];
}
}
};
diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESSLContext.java
b/java/org/apache/tomcat/util/net/jsse/JSSESSLContext.java
index 413c5ea822..6d229cb1ae 100644
--- a/java/org/apache/tomcat/util/net/jsse/JSSESSLContext.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESSLContext.java
@@ -97,9 +97,7 @@ class JSSESSLContext implements SSLContext {
for (TrustManager tm : tms) {
if (tm instanceof X509TrustManager) {
X509Certificate[] accepted = ((X509TrustManager)
tm).getAcceptedIssuers();
- if (accepted != null) {
- certs.addAll(Arrays.asList(accepted));
- }
+ certs.addAll(Arrays.asList(accepted));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
