Fix for reported issue #2769 (#2781)

microsoft · Oct 9, 2024 · 0844597 · 0844597
1 parent d4275c4
commit 0844597
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/Extensions/DataGrid.EntityFrameworkAdapter/EntityFrameworkAsyncQueryExecutor.cs b/src/Extensions/DataGrid.EntityFrameworkAdapter/EntityFrameworkAsyncQueryExecutor.cs
@@ -19,15 +19,22 @@ public Task<T[]> ToArrayAsync<T>(IQueryable<T> queryable, CancellationToken canc
 
     private async Task<TResult> ExecuteAsync<TResult>(Func<Task<TResult>> operation)
     {
-        await _lock.WaitAsync();
-
         try
         {
-            return await operation();
+            await _lock.WaitAsync();
+
+            try
+            {
+                return await operation();
+            }
+            finally
+            {
+                _lock.Release();
+            }
         }
-        finally
+        catch (ObjectDisposedException)
         {
-            _lock.Release();
+            return default!;
         }
     }