diff options
author | Steve Kondik <shade@chemlab.org> | 2013-08-23 14:51:08 -0700 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2013-08-23 14:51:08 -0700 |
commit | e2893d1bd6fff9d666bf58e84d9efbbbe4519cb3 (patch) | |
tree | 8ad2449ee581d15a30db66a19fa8bb8f6a20af55 | |
parent | 435ac64ad97998bfe96f8c05cbd00820fec7d789 (diff) | |
parent | 3ef34ed4e20ba53c906f049a01d5d3dbc10a9bec (diff) | |
download | android_external_apache-http-e2893d1bd6fff9d666bf58e84d9efbbbe4519cb3.tar.gz android_external_apache-http-e2893d1bd6fff9d666bf58e84d9efbbbe4519cb3.tar.bz2 android_external_apache-http-e2893d1bd6fff9d666bf58e84d9efbbbe4519cb3.zip |
Merge tag 'android-4.3_r2.2' of https://android.googlesource.com/platform/external/apache-http into cm-10.2
Android 4.3 release 2.2
-rw-r--r-- | src/org/apache/http/conn/ssl/SSLSocketFactory.java | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/org/apache/http/conn/ssl/SSLSocketFactory.java b/src/org/apache/http/conn/ssl/SSLSocketFactory.java index 1be6c3a..9195b4f 100644 --- a/src/org/apache/http/conn/ssl/SSLSocketFactory.java +++ b/src/org/apache/http/conn/ssl/SSLSocketFactory.java @@ -150,19 +150,26 @@ public class SSLSocketFactory implements LayeredSocketFactory { public static final X509HostnameVerifier STRICT_HOSTNAME_VERIFIER = new StrictHostnameVerifier(); - /** - * The factory using the default JVM settings for secure connections. + + /* + * Put defaults into holder class to avoid class preloading creating an + * instance of the classes referenced. */ - private static final SSLSocketFactory DEFAULT_FACTORY = new SSLSocketFactory(); - + private static class NoPreloadHolder { + /** + * The factory using the default JVM settings for secure connections. + */ + private static final SSLSocketFactory DEFAULT_FACTORY = new SSLSocketFactory(); + } + /** * Gets an singleton instance of the SSLProtocolSocketFactory. * @return a SSLProtocolSocketFactory */ public static SSLSocketFactory getSocketFactory() { - return DEFAULT_FACTORY; + return NoPreloadHolder.DEFAULT_FACTORY; } - + private final SSLContext sslcontext; private final javax.net.ssl.SSLSocketFactory socketfactory; private final HostNameResolver nameResolver; |