Dispose semaphore

manandre · manandre · commit 5b5d86ea66dc · 2023-01-11T23:44:49.000+01:00
diff --git a/src/Npgsql/Internal/NpgsqlConnector.cs b/src/Npgsql/Internal/NpgsqlConnector.cs
@@ -1889,14 +1889,21 @@ internal void Close()
         Close(async: false).GetAwaiter().GetResult();
     }
 
-    SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
+    readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
 
     internal async Task Close(bool async, CancellationToken cancellationToken = default)
     {
-        if (async)
-            await _semaphore.WaitAsync(cancellationToken);
-        else
-            _semaphore.Wait(cancellationToken);
+        try
+        {
+            if (async)
+                await _semaphore.WaitAsync(cancellationToken);
+            else
+                _semaphore.Wait(cancellationToken);
+        }
+        catch (ObjectDisposedException)
+        {
+            return;
+        }
 
         try
         {
@@ -1932,7 +1939,15 @@ internal async Task Close(bool async, CancellationToken cancellationToken = defa
         }
         finally
         {
-            _semaphore.Release();
+            try
+            {
+                _semaphore.Release();
+                _semaphore.Dispose();
+            }
+            catch (ObjectDisposedException)
+            {
+                // Ignore
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1889,14 +1889,21 @@ internal void Close()`
`1889`	`1889`	`Close(async: false).GetAwaiter().GetResult();`
`1890`	`1890`	`}`
`1891`	`1891`
`1892`		`- SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);`
	`1892`	`+ readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);`
`1893`	`1893`
`1894`	`1894`	`internal async Task Close(bool async, CancellationToken cancellationToken = default)`
`1895`	`1895`	`{`
`1896`		`- if (async)`
`1897`		`- await _semaphore.WaitAsync(cancellationToken);`
`1898`		`- else`
`1899`		`- _semaphore.Wait(cancellationToken);`
	`1896`	`+ try`
	`1897`	`+ {`
	`1898`	`+ if (async)`
	`1899`	`+ await _semaphore.WaitAsync(cancellationToken);`
	`1900`	`+ else`
	`1901`	`+ _semaphore.Wait(cancellationToken);`
	`1902`	`+ }`
	`1903`	`+ catch (ObjectDisposedException)`
	`1904`	`+ {`
	`1905`	`+ return;`
	`1906`	`+ }`
`1900`	`1907`
`1901`	`1908`	`try`
`1902`	`1909`	`{`
`@@ -1932,7 +1939,15 @@ internal async Task Close(bool async, CancellationToken cancellationToken = defa`
`1932`	`1939`	`}`
`1933`	`1940`	`finally`
`1934`	`1941`	`{`
`1935`		`- _semaphore.Release();`
	`1942`	`+ try`
	`1943`	`+ {`
	`1944`	`+ _semaphore.Release();`
	`1945`	`+ _semaphore.Dispose();`
	`1946`	`+ }`
	`1947`	`+ catch (ObjectDisposedException)`
	`1948`	`+ {`
	`1949`	`+ // Ignore`
	`1950`	`+ }`
`1936`	`1951`	`}`
`1937`	`1952`	`}`
`1938`	`1953`