Merge pull request #542 from mariosmeim-db/fix-for-keepalivesocketfactory-regression

Fix for keepalivesocketfactory regression

Author: rickle-msft

microsoft-azure-storage/src/com/microsoft/azure/storage/core/BaseRequest.java

@@ -230,7 +230,7 @@ protected PasswordAuthentication getPasswordAuthentication() {
          */
         if (retConnection instanceof HttpsURLConnection && !options.disableHttpsSocketKeepAlive()) {
             HttpsURLConnection httpsConnection = ((HttpsURLConnection) retConnection);
-            httpsConnection.setSSLSocketFactory(new KeepAliveSocketFactory(httpsConnection.getSSLSocketFactory()));
+            httpsConnection.setSSLSocketFactory(KeepAliveSocketFactory.getInstance());
         }
 
         /*

microsoft-azure-storage/src/com/microsoft/azure/storage/core/KeepAliveSocketFactory.java

@@ -15,6 +15,7 @@
 
 package com.microsoft.azure.storage.core;
 
+import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;
 import java.io.IOException;
 import java.net.InetAddress;
@@ -39,10 +40,16 @@
 public class KeepAliveSocketFactory extends SSLSocketFactory {
     private SSLSocketFactory delegate;
 
+    private static final KeepAliveSocketFactory singletonKeepAliveSocketFactory = new KeepAliveSocketFactory(HttpsURLConnection.getDefaultSSLSocketFactory());
+
     KeepAliveSocketFactory(SSLSocketFactory delegate) {
         this.delegate = delegate;
     }
 
+    public static KeepAliveSocketFactory getInstance() {
+        return singletonKeepAliveSocketFactory;
+    }
+
     @Override
     public String[] getDefaultCipherSuites() {
         return delegate.getDefaultCipherSuites();