svn commit: r1508013 - /httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java

[ol...@apache.org]

Author: olegk
Date: Mon Jul 29 12:29:18 2013
New Revision: 1508013

URL: http://svn.apache.org/r1508013
Log:
Removed references to deprecated code

Modified:
    httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java

Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java?rev=1508013&r1=1508012&r2=1508013&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java Mon Jul 29 12:29:18 2013
@@ -51,8 +51,8 @@ import org.apache.http.config.RegistryBu
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.conn.ssl.SSLInitializationException;
-import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.impl.auth.BasicScheme;
 import org.apache.http.impl.client.BasicAuthCache;
 import org.apache.http.impl.client.BasicCredentialsProvider;
@@ -75,13 +75,13 @@ public class Executor {
     static {
         LayeredConnectionSocketFactory ssl = null;
         try {
-            ssl = SSLSocketFactory.getSystemSocketFactory();
+            ssl = SSLConnectionSocketFactory.getSystemSocketFactory();
         } catch (final SSLInitializationException ex) {
-            SSLContext sslcontext;
+            final SSLContext sslcontext;
             try {
-                sslcontext = SSLContext.getInstance(SSLSocketFactory.TLS);
+                sslcontext = SSLContext.getInstance(SSLConnectionSocketFactory.TLS);
                 sslcontext.init(null, null, null);
-                ssl = new SSLSocketFactory(sslcontext);
+                ssl = new SSLConnectionSocketFactory(sslcontext);
             } catch (final SecurityException ignore) {
             } catch (final KeyManagementException ignore) {
             } catch (final NoSuchAlgorithmException ignore) {
@@ -90,7 +90,7 @@ public class Executor {
 
         final Registry<ConnectionSocketFactory> sfr = RegistryBuilder.<ConnectionSocketFactory>create()
             .register("http", PlainConnectionSocketFactory.getSocketFactory())
-            .register("https", ssl != null ? ssl : SSLSocketFactory.getSocketFactory())
+            .register("https", ssl != null ? ssl : SSLConnectionSocketFactory.getSocketFactory())
             .build();
 
         CONNMGR = new PoolingHttpClientConnectionManager(sfr);
@@ -138,7 +138,7 @@ public class Executor {
         final BasicScheme basicScheme = new BasicScheme();
         try {
             basicScheme.processChallenge(new BasicHeader(AUTH.WWW_AUTH, "BASIC "));
-        } catch (final MalformedChallengeException ingnore) {
+        } catch (final MalformedChallengeException ignore) {
         }
         this.authCache.put(host, basicScheme);
         return this;
@@ -148,7 +148,7 @@ public class Executor {
         final BasicScheme basicScheme = new BasicScheme();
         try {
             basicScheme.processChallenge(new BasicHeader(AUTH.PROXY_AUTH, "BASIC "));
-        } catch (final MalformedChallengeException ingnore) {
+        } catch (final MalformedChallengeException ignore) {
         }
         this.authCache.put(host, basicScheme);
         return this;