Properly map exceptions from NetworkStream ctor. (#39514)

ManickaP · web-flow · commit 628d99b624f3 · 2020-07-20T15:57:16.000+02:00
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
@@ -96,14 +96,14 @@ private static Stream Connect(string host, int port, CancellationToken cancellat
                 {
                     socket.Connect(new DnsEndPoint(host, port));
                 }
+
+                return new NetworkStream(socket, ownsSocket: true);
             }
             catch (Exception e)
             {
                 socket.Dispose();
                 throw CreateWrappedException(e, host, port, cancellationToken);
             }
-
-            return new NetworkStream(socket, ownsSocket: true);
         }
 
         /// <summary>SocketAsyncEventArgs that carries with it additional state for a Task builder and a CancellationToken.</summary>

Original file line number	Diff line number	Diff line change
`@@ -96,14 +96,14 @@ private static Stream Connect(string host, int port, CancellationToken cancellat`
`96`	`96`	`{`
`97`	`97`	`socket.Connect(new DnsEndPoint(host, port));`
`98`	`98`	`}`
	`99`	`+`
	`100`	`+ return new NetworkStream(socket, ownsSocket: true);`
`99`	`101`	`}`
`100`	`102`	`catch (Exception e)`
`101`	`103`	`{`
`102`	`104`	`socket.Dispose();`
`103`	`105`	`throw CreateWrappedException(e, host, port, cancellationToken);`
`104`	`106`	`}`
`105`		`-`
`106`		`- return new NetworkStream(socket, ownsSocket: true);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`/// <summary>SocketAsyncEventArgs that carries with it additional state for a Task builder and a CancellationToken.</summary>`