[release/9.0-staging] [DNS] Ignore ObjectDisposedException on CancellationToken Callback (#115840)

github-actions[bot] · liveans · jkotas · web-flow · commit 55a7a99f87a4 · 2025-05-27T09:05:51.000+02:00
* Ignore ObjectDisposedException on CancellationToken Callback

* Update src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.cs

Co-authored-by: Jan Kotas &lt;jkotas@microsoft.com&gt;

* Change wording in comment

* Update src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.cs

---------

Co-authored-by: Ahmet Ibrahim Aksoy &lt;aaksoy@microsoft.com&gt;
Co-authored-by: Jan Kotas &lt;jkotas@microsoft.com&gt;
diff --git a/src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.cs b/src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.cs
@@ -437,6 +437,11 @@ public void RegisterForCancellation(CancellationToken cancellationToken)
                             NetEventSource.Info(@this, $"GetAddrInfoExCancel returned error {cancelResult}");
                         }
                     }
+                    catch (ObjectDisposedException)
+                    {
+                        // There is a race between checking @this._completed and @this.DangerousAddRef and disposing from another thread.
+                        // We lost the race. No further action needed.
+                    }
                     finally
                     {
                         if (needRelease)

Original file line number	Diff line number	Diff line change
`@@ -437,6 +437,11 @@ public void RegisterForCancellation(CancellationToken cancellationToken)`
`437`	`437`	`NetEventSource.Info(@this, $"GetAddrInfoExCancel returned error {cancelResult}");`
`438`	`438`	`}`
`439`	`439`	`}`
	`440`	`+ catch (ObjectDisposedException)`
	`441`	`+ {`
	`442`	`+ // There is a race between checking @this._completed and @this.DangerousAddRef and disposing from another thread.`
	`443`	`+ // We lost the race. No further action needed.`
	`444`	`+ }`
`440`	`445`	`finally`
`441`	`446`	`{`
`442`	`447`	`if (needRelease)`