From 84f359d025d6620cf996c7e15c076e5c13dafc1d Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Thu, 17 Sep 2015 09:46:39 +0100
Subject: [PATCH] Fix DelegatingSSLSocketFactory for Android

Commit 765a965 (pr #1835) did not modify all the necessary lines
when changing the configureSocket() method over from a
modify-in-place to a return-modified pattern. The problem
only shows up on Android where the behavior is required for
TLS_FALLBACK_SCSV tests to work.
---
 .../okhttp/DelegatingSSLSocketFactory.java     | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/DelegatingSSLSocketFactory.java b/okhttp-tests/src/test/java/com/squareup/okhttp/DelegatingSSLSocketFactory.java
index 3fe6eb48a..38a5de8f8 100644
--- a/okhttp-tests/src/test/java/com/squareup/okhttp/DelegatingSSLSocketFactory.java
+++ b/okhttp-tests/src/test/java/com/squareup/okhttp/DelegatingSSLSocketFactory.java
@@ -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 {