ODE

src/libraries/System.Threading.RateLimiting/src/System/Threading/RateLimiting/ConcurrencyLimiter.cs

@@ -49,8 +49,10 @@ protected override RateLimitLease AcquireCore(int permitCount)
                 throw new ArgumentOutOfRangeException(nameof(permitCount), permitCount, SR.Format(SR.PermitLimitExceeded, permitCount, _options.PermitLimit));
             }
 
+            ThrowIfDisposed();
+
             // Return SuccessfulLease or FailedLease to indicate limiter state
-            if (permitCount == 0 && !_disposed)
+            if (permitCount == 0)
             {
                 return _permitCount > 0 ? SuccessfulLease : FailedLease;
             }
@@ -120,11 +122,7 @@ protected override ValueTask<RateLimitLease> WaitAsyncCore(int permitCount, Canc
 
         private bool TryLeaseUnsynchronized(int permitCount, [NotNullWhen(true)] out RateLimitLease? lease)
         {
-            if (_disposed)
-            {
-                lease = FailedLease;
-                return true;
-            }
+            ThrowIfDisposed();
 
             // if permitCount is 0 we want to queue it if there are no available permits
             if (_permitCount >= permitCount && _permitCount != 0)
@@ -231,6 +229,14 @@ protected override ValueTask DisposeAsyncCore()
             return default;
         }
 
+        private void ThrowIfDisposed()
+        {
+            if (_disposed)
+            {
+                throw new ObjectDisposedException(nameof(ConcurrencyLimiter));
+            }
+        }
+
         private sealed class ConcurrencyLease : RateLimitLease
         {
             private static readonly string[] s_allMetadataNames = new[] { MetadataName.ReasonPhrase.Name };

src/libraries/System.Threading.RateLimiting/src/System/Threading/RateLimiting/RateLimiter.cs

@@ -82,7 +82,7 @@ public ValueTask<RateLimitLease> WaitAsync(int permitCount = 1, CancellationToke
         protected virtual void Dispose(bool disposing) { }
 
         /// <summary>
-        /// Dispose the RateLimiter. This completes any queued acquires with a failed lease.
+        /// Disposes the RateLimiter. This completes any queued acquires with a failed lease.
         /// </summary>
         public void Dispose()
         {
@@ -100,7 +100,7 @@ protected virtual ValueTask DisposeAsyncCore()
         }
 
         /// <summary>
-        /// Diposes the RateLimiter asynchronously.
+        /// Disposes the RateLimiter asynchronously.
         /// </summary>
         /// <returns>ValueTask representin the completion of the disposal.</returns>
         public async ValueTask DisposeAsync()

src/libraries/System.Threading.RateLimiting/src/System/Threading/RateLimiting/TokenBucketRateLimiter.cs

@@ -86,8 +86,10 @@ protected override ValueTask<RateLimitLease> WaitAsyncCore(int tokenCount, Cance
                 throw new ArgumentOutOfRangeException(nameof(tokenCount), tokenCount, SR.Format(SR.TokenLimitExceeded, tokenCount, _options.TokenLimit));
             }
 
+            ThrowIfDisposed();
+
             // Return SuccessfulAcquisition if requestedCount is 0 and resources are available
-            if (tokenCount == 0 && _tokenCount > 0 && !_disposed)
+            if (tokenCount == 0 && _tokenCount > 0)
             {
                 return new ValueTask<RateLimitLease>(SuccessfulLease);
             }
@@ -139,11 +141,7 @@ private RateLimitLease CreateFailedTokenLease(int tokenCount)
 
         private bool TryLeaseUnsynchronized(int tokenCount, [NotNullWhen(true)] out RateLimitLease? lease)
         {
-            if (_disposed)
-            {
-                lease = FailedLease;
-                return true;
-            }
+            ThrowIfDisposed();
 
             // if permitCount is 0 we want to queue it if there are no available permits
             if (_tokenCount >= tokenCount && _tokenCount != 0)
@@ -313,6 +311,14 @@ protected override ValueTask DisposeAsyncCore()
             return default;
         }
 
+        private void ThrowIfDisposed()
+        {
+            if (_disposed)
+            {
+                throw new ObjectDisposedException(nameof(TokenBucketRateLimiter));
+            }
+        }
+
         private sealed class TokenBucketLease : RateLimitLease
         {
             private static readonly string[] s_allMetadataNames = new[] { MetadataName.RetryAfter.Name };

src/libraries/System.Threading.RateLimiting/tests/ConcurrencyLimiterTests.cs

@@ -380,9 +380,9 @@ public override async Task DisposeReleasesQueuedAcquires()
 
             lease.Dispose();
 
-            // Can't acquire any leases after disposal
-            Assert.False(limiter.Acquire(1).IsAcquired);
-            Assert.False((await limiter.WaitAsync(1)).IsAcquired);
+            // Throws after disposal
+            Assert.Throws<ObjectDisposedException>(() => limiter.Acquire(1));
+            await Assert.ThrowsAsync<ObjectDisposedException>(() => limiter.WaitAsync(1).AsTask());
         }
 
         [Fact]
@@ -409,9 +409,9 @@ public override async Task DisposeAsyncReleasesQueuedAcquires()
 
             lease.Dispose();
 
-            // Can't acquire any leases after disposal
-            Assert.False(limiter.Acquire(1).IsAcquired);
-            Assert.False((await limiter.WaitAsync(1)).IsAcquired);
+            // Throws after disposal
+            Assert.Throws<ObjectDisposedException>(() => limiter.Acquire(1));
+            await Assert.ThrowsAsync<ObjectDisposedException>(() => limiter.WaitAsync(1).AsTask());
         }
 
         [Fact]

src/libraries/System.Threading.RateLimiting/tests/TokenBucketRateLimiterTests.cs

@@ -330,9 +330,9 @@ public override async Task DisposeReleasesQueuedAcquires()
             lease = await wait3;
             Assert.False(lease.IsAcquired);
 
-            // Can't acquire any leases after disposal
-            Assert.False(limiter.Acquire(1).IsAcquired);
-            Assert.False((await limiter.WaitAsync(1)).IsAcquired);
+            // Throws after disposal
+            Assert.Throws<ObjectDisposedException>(() => limiter.Acquire(1));
+            await Assert.ThrowsAsync<ObjectDisposedException>(() => limiter.WaitAsync(1).AsTask());
         }
 
         [Fact]
@@ -357,9 +357,9 @@ public override async Task DisposeAsyncReleasesQueuedAcquires()
             lease = await wait3;
             Assert.False(lease.IsAcquired);
 
-            // Can't acquire any leases after disposal
-            Assert.False(limiter.Acquire(1).IsAcquired);
-            Assert.False((await limiter.WaitAsync(1)).IsAcquired);
+            // Throws after disposal
+            Assert.Throws<ObjectDisposedException>(() => limiter.Acquire(1));
+            await Assert.ThrowsAsync<ObjectDisposedException>(() => limiter.WaitAsync(1).AsTask());
         }
 
         [Fact]