hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1644004 - /httpcomponents/httpclient/branches/4.3.x/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContextBuilder.java
Date Tue, 09 Dec 2014 09:27:16 GMT
Author: olegk
Date: Tue Dec  9 09:27:16 2014
New Revision: 1644004

URL: http://svn.apache.org/r1644004
Log:
HTTPCLIENT-1585: SSLContextBuilder to preserve natural order of trust / key managers when
loading trust / ket material from multiple sources

Modified:
    httpcomponents/httpclient/branches/4.3.x/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContextBuilder.java

Modified: httpcomponents/httpclient/branches/4.3.x/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContextBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.3.x/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContextBuilder.java?rev=1644004&r1=1644003&r2=1644004&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.3.x/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContextBuilder.java
(original)
+++ httpcomponents/httpclient/branches/4.3.x/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContextBuilder.java
Tue Dec  9 09:27:16 2014
@@ -39,7 +39,7 @@ import java.security.UnrecoverableKeyExc
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -71,8 +71,8 @@ public class SSLContextBuilder {
 
     public SSLContextBuilder() {
         super();
-        this.keymanagers = new HashSet<KeyManager>();
-        this.trustmanagers = new HashSet<TrustManager>();
+        this.keymanagers = new LinkedHashSet<KeyManager>();
+        this.trustmanagers = new LinkedHashSet<TrustManager>();
     }
 
     public SSLContextBuilder useTLS() {



Mime
View raw message