android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-17 08:42:25 +03:00
Code Releases Activity

Merge pull request #1858 from nfuller/FixDelegatingSSLSocketFactory

Browse Source 
Fix DelegatingSSLSocketFactory for Android
This commit is contained in:
Jesse Wilson
2015-09-17 11:44:20 -04:00
parent 40aa83e011 84f359d025
commit 19455e754f
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
okhttp-tests/src/test/java/com/squareup/okhttp/DelegatingSSLSocketFactory.java
View File

@@ -38,38 +38,33 @@ public class DelegatingSSLSocketFactory extends SSLSocketFactory {
@Override
public SSLSocket createSocket() throws IOException {
SSLSocket sslSocket = (SSLSocket) delegate.createSocket();
configureSocket(sslSocket);
return sslSocket;
return configureSocket(sslSocket);
}
@Override
public SSLSocket createSocket(String host, int port) throws IOException, UnknownHostException {
SSLSocket sslSocket = (SSLSocket) delegate.createSocket(host, port);
configureSocket(sslSocket);
return sslSocket;
return configureSocket(sslSocket);
}
@Override
public SSLSocket createSocket(String host, int port, InetAddress localAddress, int localPort)
throws IOException, UnknownHostException {
SSLSocket sslSocket = (SSLSocket) delegate.createSocket(host, port, localAddress, localPort);
configureSocket(sslSocket);
return sslSocket;
return configureSocket(sslSocket);
}
@Override
public SSLSocket createSocket(InetAddress host, int port) throws IOException {
SSLSocket sslSocket = (SSLSocket) delegate.createSocket(host, port);
configureSocket(sslSocket);
return sslSocket;
return configureSocket(sslSocket);
}
@Override
public SSLSocket createSocket(InetAddress host, int port, InetAddress localAddress, int localPort)
throws IOException {
SSLSocket sslSocket = (SSLSocket) delegate.createSocket(host, port, localAddress, localPort);
configureSocket(sslSocket);
return sslSocket;
return configureSocket(sslSocket);
}
@Override
@@ -86,8 +81,7 @@ public class DelegatingSSLSocketFactory extends SSLSocketFactory {
public SSLSocket createSocket(Socket socket, String host, int port, boolean autoClose)
throws IOException {
SSLSocket sslSocket = (SSLSocket) delegate.createSocket(socket, host, port, autoClose);
configureSocket(sslSocket);
return sslSocket;
return configureSocket(sslSocket);
}
protected SSLSocket configureSocket(SSLSocket sslSocket) throws IOException {