You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hc.apache.org by ol...@apache.org on 2014/12/09 10:34:59 UTC

svn commit: r1644009 - /httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/ssl/SSLContextBuilder.java

Author: olegk
Date: Tue Dec  9 09:34:59 2014
New Revision: 1644009

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

Modified:
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/ssl/SSLContextBuilder.java

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/ssl/SSLContextBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/ssl/SSLContextBuilder.java?rev=1644009&r1=1644008&r2=1644009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/ssl/SSLContextBuilder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/ssl/SSLContextBuilder.java Tue Dec  9 09:34:59 2014
@@ -44,7 +44,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;
 
@@ -80,8 +80,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 useProtocol(final String protocol) {