diff options
author | Kenny Root <kroot@google.com> | 2013-07-23 20:10:12 -0700 |
---|---|---|
committer | Kenny Root <kroot@google.com> | 2013-07-23 22:43:34 -0700 |
commit | 72017834153711733905dfcf4bfe7b802062692b (patch) | |
tree | 8ad2449ee581d15a30db66a19fa8bb8f6a20af55 | |
parent | afcea7f897b0969bdb2fa91459f76031ab35721c (diff) | |
download | android_external_apache-http-72017834153711733905dfcf4bfe7b802062692b.tar.gz android_external_apache-http-72017834153711733905dfcf4bfe7b802062692b.tar.bz2 android_external_apache-http-72017834153711733905dfcf4bfe7b802062692b.zip |
Do not initialize SSLSocketFactory too early
During Zygote initialization, the class may be preloaded. However we do
not want the default instances of SSLSocketFactory initialized, so move
those into a holder class so they are only initialized when used.
Bug: 9984058
Change-Id: Icf91f4fb60b7e4e5e9fbb22def01073dc1663128
-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; |