This is an automated email from the ASF dual-hosted git repository.
remm 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 2dc232d897 getAcceptedIssuers must not return null
2dc232d897 is described below
commit 2dc232d897f1b532cbef7eb6f9462489f2e90a39
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.
---
java/org/apache/tomcat/util/net/jsse/JSSESSLContext.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
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]
