Reduce ObjectDisposedException

ViveportSoftware · Oct 19, 2021 · 8cfd6fb · 8cfd6fb
1 parent 6c2a80d
commit 8cfd6fb
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/source/Htc.Vita.Core/Auth/DefaultOAuth2.cs b/source/Htc.Vita.Core/Auth/DefaultOAuth2.cs
@@ -271,10 +271,21 @@ private void HandleHttpRequest(object o)
                 {
                     return;
                 }
+                if (Disposed)
+                {
+                    return;
+                }
 
                 if (_cancellationToken.IsCancellationRequested)
                 {
-                    _countdownEvent.Signal();
+                    try
+                    {
+                        _countdownEvent.Signal();
+                    }
+                    catch (ObjectDisposedException)
+                    {
+                        Logger.GetInstance(typeof(DefaultAuthorizationCodeReceiver)).Error("Can not access disposed CountdownEvent");
+                    }
                 }
 
                 var request = httpListenerContext.Request;
@@ -308,7 +319,14 @@ private void HandleHttpRequest(object o)
                 SpinWait.SpinUntil(() => false, TimeSpan.FromMilliseconds(200));
 
                 _shouldKeepListening = false;
-                _countdownEvent.Signal();
+                try
+                {
+                    _countdownEvent.Signal();
+                }
+                catch (ObjectDisposedException)
+                {
+                    Logger.GetInstance(typeof(DefaultAuthorizationCodeReceiver)).Error("Can not access disposed CountdownEvent");
+                }
             }
 
             /// <inheritdoc />