Merge branch 'master' of https://github.com/square/okhttp

nxbdi · May 6, 2013 · aa5b823 · aa5b823
2 parents 37a513b + 02864cb
commit aa5b823
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java b/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java
@@ -147,7 +147,7 @@ public OkHttpClient setSSLSocketFactory(SSLSocketFactory sslSocketFactory) {
     return this;
   }
 
-  public SSLSocketFactory getSslSocketFactory() {
+  public SSLSocketFactory getSSLSocketFactory() {
     return sslSocketFactory;
   }
 

diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java b/okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpURLConnectionImpl.java
@@ -114,7 +114,7 @@ public HttpURLConnectionImpl(URL url, OkHttpClient client, OkResponseCache respo
     this.proxySelector = client.getProxySelector();
     this.cookieHandler = client.getCookieHandler();
     this.connectionPool = client.getConnectionPool();
-    this.sslSocketFactory = client.getSslSocketFactory();
+    this.sslSocketFactory = client.getSSLSocketFactory();
     this.hostnameVerifier = client.getHostnameVerifier();
     this.transports = client.getTransports();
     this.authenticator = client.getAuthenticator();