[tomcat] branch master updated: Ensure consistent ordering of certificates

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new e71fd69  Ensure consistent ordering of certificates
e71fd69 is described below

commit e71fd6948f3307abdfd2eb1f62719c409913ab48
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 27 20:00:45 2019 +0000

    Ensure consistent ordering of certificates
    
    Using a HashSet meant that certificates were not guaranteed to be
    returned in the order they were added. This caused inconsistent
    behaviour in the unit tests.
---
 java/org/apache/tomcat/util/net/SSLHostConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java 
b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index 4fa5eb2..b88aa2b 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
@@ -88,7 +88,7 @@ public class SSLHostConfig implements Serializable {
     private Set<String> explicitlyRequestedProtocols = new HashSet<>();
     // Nested
     private SSLHostConfigCertificate defaultCertificate = null;
-    private Set<SSLHostConfigCertificate> certificates = new HashSet<>(4);
+    private Set<SSLHostConfigCertificate> certificates = new 
LinkedHashSet<>(4);
     // Common
     private String certificateRevocationListFile;
     private CertificateVerification certificateVerification = 
CertificateVerification.NONE;


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org