From c94fb127521bc05864ea9bb2f3b50bf0f7520faf Mon Sep 17 00:00:00 2001 From: Sebastian Bazley Date: Thu, 30 Jul 2009 10:52:00 +0000 Subject: [PATCH] Improve thread-safety git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@799233 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/http/conn/ssl/SSLSocketFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java b/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java index e1fe56581..ddacdab2a 100644 --- a/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java +++ b/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java @@ -178,7 +178,9 @@ public static SSLSocketFactory getSocketFactory() { private final SSLContext sslcontext; private final javax.net.ssl.SSLSocketFactory socketfactory; private final HostNameResolver nameResolver; - private X509HostnameVerifier hostnameVerifier = BROWSER_COMPATIBLE_HOSTNAME_VERIFIER; + + // volatile is needed to guarantee thread-safety of the setter/getter methods under all usage scenarios + private volatile X509HostnameVerifier hostnameVerifier = BROWSER_COMPATIBLE_HOSTNAME_VERIFIER; public SSLSocketFactory( String algorithm,