From f16c8752ec44d78b4b9251e7113abb7879d7ef36 Mon Sep 17 00:00:00 2001 From: Grisha Kotler Date: Mon, 9 Dec 2024 11:57:06 +0200 Subject: [PATCH] RavenDB-23065 - check the cancellationToken for each call to Read or Write --- src/Raven.Client/Util/StreamWithTimeout.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Raven.Client/Util/StreamWithTimeout.cs b/src/Raven.Client/Util/StreamWithTimeout.cs index 34f5b71655aa..c23c6dc267a6 100644 --- a/src/Raven.Client/Util/StreamWithTimeout.cs +++ b/src/Raven.Client/Util/StreamWithTimeout.cs @@ -189,12 +189,12 @@ private async Task ReadAsyncWithTimeout(byte[] buffer, int offset, int coun _readCts?.Dispose(); _readCts = GenerateCancellationTokenWithTimeout(_readTimeout, cancellationToken); } + } #if DEBUG - if (_requestReadCts != cancellationToken) - throw new InvalidOperationException("The cancellation token was changed during the request"); + if (_requestReadCts != cancellationToken) + throw new InvalidOperationException("The cancellation token was changed during the request"); #endif - } var read = await _stream.ReadAsync(buffer, offset, count, _readCts.Token).ConfigureAwait(false); _totalRead += read; @@ -252,12 +252,12 @@ private Task WriteAsyncWithTimeout(byte[] buffer, int offset, int count, Cancell _writeCts.Dispose(); _writeCts = GenerateCancellationTokenWithTimeout(_writeTimeout, cancellationToken); } + } #if DEBUG - if (_requestWriteCts != cancellationToken) - throw new InvalidOperationException("The cancellation token was changed during the request"); + if (_requestWriteCts != cancellationToken) + throw new InvalidOperationException("The cancellation token was changed during the request"); #endif - } return _stream.WriteAsync(buffer, offset, count, _writeCts.Token); }