Fix sync ConnectHelper.Connect (#40880)

dotnet · Aug 15, 2020 · a32d979 · a32d979
1 parent c00478b
commit a32d979
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectHelper.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectHelper.cs
@@ -62,6 +62,9 @@ public static Connection Connect(string host, int port, CancellationToken cancel
                 {
                     socket.Connect(new DnsEndPoint(host, port));
                 }
+
+                // Since we only do GracefulShutdown in SocketsHttpHandler code, Connection.FromStream() should match SocketConnection's behavior:
+                return Connection.FromStream(new NetworkStream(socket, ownsSocket: true), localEndPoint: socket.LocalEndPoint, remoteEndPoint: socket.RemoteEndPoint);
             }
             catch (SocketException se)
             {
@@ -77,9 +80,6 @@ public static Connection Connect(string host, int port, CancellationToken cancel
                 socket.Dispose();
                 throw CreateWrappedException(e, host, port, cancellationToken);
             }
-
-            // Since we only do GracefulShutdown in SocketsHttpHandler code, Connection.FromStream() should match SocketConnection's behavior:
-            return Connection.FromStream(new NetworkStream(socket, ownsSocket: true), localEndPoint: socket.LocalEndPoint, remoteEndPoint: socket.RemoteEndPoint);
         }
 
         public static ValueTask<SslStream> EstablishSslConnectionAsync(SslClientAuthenticationOptions sslOptions, HttpRequestMessage request, bool async, Stream stream, CancellationToken cancellationToken)