cancellation source instead of wait

getsentry · Dec 11, 2024 · 565caa7 · 565caa7
1 parent 6695d97
commit 565caa7
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/Sentry.Unity.Android/JniExecutor.cs b/src/Sentry.Unity.Android/JniExecutor.cs
@@ -93,16 +93,14 @@ private void DoWork()
     {
         lock (_lock)
         {
+            using var timeoutCts = new CancellationTokenSource(Timeout);
             _taskCompletionSource = new TaskCompletionSource<object?>();
             _currentTask = jniOperation;
             _taskEvent.Set();
 
             try
             {
-                if (!_taskCompletionSource.Task.Wait(Timeout))
-                {
-                    throw new TimeoutException($"JNI operation timed out after {Timeout.Milliseconds}ms");
-                }
+                _taskCompletionSource.Task.Wait(timeoutCts.Token);
                 return (TResult?)_taskCompletionSource.Task.Result;
             }
             catch (Exception e)
@@ -121,16 +119,14 @@ public void Run(Action jniOperation)
     {
         lock (_lock)
         {
+            using var timeoutCts = new CancellationTokenSource(Timeout);
             _taskCompletionSource = new TaskCompletionSource<object?>();
             _currentTask = jniOperation;
             _taskEvent.Set();
 
             try
             {
-                if (!_taskCompletionSource.Task.Wait(Timeout))
-                {
-                    throw new TimeoutException($"JNI operation timed out after {Timeout.Milliseconds}ms");
-                }
+                _taskCompletionSource.Task.Wait(timeoutCts.Token);
             }
             catch (Exception e)
             {