better Dispose pattern

deephaven · Sep 2, 2024 · d185285 · d185285
1 parent ceb3967
commit d185285
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/csharp/ExcelAddIn/providers/ClientProvider.cs b/csharp/ExcelAddIn/providers/ClientProvider.cs
@@ -112,9 +112,10 @@ private void DisposeClientState() {
  return;
  }
 
- if (_ownedDndClient != null) {
+ var oldClient = Utility.Exchange(ref _ownedDndClient, null);
+ if (oldClient != null) {
  _observers.SetAndSendStatus(ref _client, "Disposing client");
- _ownedDndClient.Dispose();
+ oldClient.Dispose();
  }
  }
 

diff --git a/csharp/ExcelAddIn/providers/TableHandleProvider.cs b/csharp/ExcelAddIn/providers/TableHandleProvider.cs
@@ -80,7 +80,7 @@ private void DisposePqAndThState() {
  return;
  }
 
- _ = _tableHandle.GetValueOrStatus(out var oldTh, out var _);
+ _ = _tableHandle.GetValueOrStatus(out var oldTh, out _);
 
  if (oldTh != null) {
  _observers.SetAndSendStatus(ref _tableHandle, "Disposing TableHandle");