Do not rethrow from SocketsTestServerAPM.OnAccept (#114964)

rzikm · MihaZupan · web-flow · commit 5d42918cebad · 2025-04-25T14:01:11.000+02:00
* Do not rethrow from SocketTestServerAPM.OnAccept

* Update src/libraries/Common/tests/System/Net/Sockets/SocketTestServerAPM.cs

Co-authored-by: Miha Zupan &lt;mihazupan.zupan1@gmail.com&gt;

* Update src/libraries/Common/tests/System/Net/Sockets/SocketTestServerAPM.cs

---------

Co-authored-by: Miha Zupan &lt;mihazupan.zupan1@gmail.com&gt;
diff --git a/src/libraries/Common/tests/System/Net/Sockets/SocketTestServerAPM.cs b/src/libraries/Common/tests/System/Net/Sockets/SocketTestServerAPM.cs
@@ -51,16 +51,9 @@ private void OnAccept(IAsyncResult result)
             {
                 client = _socket.EndAccept(result);
             }
-            catch (SocketException e)
+            catch (SocketException)
             {
-                if (_disposed ||
-                    e.SocketErrorCode == SocketError.OperationAborted ||
-                    e.SocketErrorCode == SocketError.Interrupted)
-                {
-                    return;
-                }
-
-                throw;
+                return;
             }
             catch (ObjectDisposedException)
             {
@@ -81,16 +74,8 @@ private void OnAccept(IAsyncResult result)
             {
                 _socket.BeginAccept(OnAccept, null);
             }
-            catch (SocketException e)
+            catch (SocketException)
             {
-                if (_disposed ||
-                    e.SocketErrorCode == SocketError.OperationAborted ||
-                    e.SocketErrorCode == SocketError.Interrupted)
-                {
-                    return;
-                }
-
-                throw;
             }
             catch (ObjectDisposedException)
             {

Original file line number	Diff line number	Diff line change
`@@ -51,16 +51,9 @@ private void OnAccept(IAsyncResult result)`
`51`	`51`	`{`
`52`	`52`	`client = _socket.EndAccept(result);`
`53`	`53`	`}`
`54`		`- catch (SocketException e)`
	`54`	`+ catch (SocketException)`
`55`	`55`	`{`
`56`		`- if (_disposed \|\|`
`57`		`- e.SocketErrorCode == SocketError.OperationAborted \|\|`
`58`		`- e.SocketErrorCode == SocketError.Interrupted)`
`59`		`- {`
`60`		`- return;`
`61`		`- }`
`62`		`-`
`63`		`- throw;`
	`56`	`+ return;`
`64`	`57`	`}`
`65`	`58`	`catch (ObjectDisposedException)`
`66`	`59`	`{`
`@@ -81,16 +74,8 @@ private void OnAccept(IAsyncResult result)`
`81`	`74`	`{`
`82`	`75`	`_socket.BeginAccept(OnAccept, null);`
`83`	`76`	`}`
`84`		`- catch (SocketException e)`
	`77`	`+ catch (SocketException)`
`85`	`78`	`{`
`86`		`- if (_disposed \|\|`
`87`		`- e.SocketErrorCode == SocketError.OperationAborted \|\|`
`88`		`- e.SocketErrorCode == SocketError.Interrupted)`
`89`		`- {`
`90`		`- return;`
`91`		`- }`
`92`		`-`
`93`		`- throw;`
`94`	`79`	`}`
`95`	`80`	`catch (ObjectDisposedException)`
`96`	`81`	`{`