Skip to content

Improve disposal logic in AsyncWebsocketMessageResultEnumerator to prevent multiple disposals #476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KrzysztofCwalina merged 3 commits into from
Jun 24, 2025
Merged

Improve disposal logic in AsyncWebsocketMessageResultEnumerator to prevent multiple disposals #476

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e061c35
Improve disposal logic in AsyncWebsocketMessageResultEnumerator to pr…
christothes Jun 23, 2025
1cf836b
fb
christothes Jun 24, 2025
6699f39
Update src/Custom/RealtimeConversation/Internal/AsyncWebsocketMessage…
christothes Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fb
  • Loading branch information
@christothes
christothes committed Jun 24, 2025
commit 1cf836b06d7a5b3e715de7ad72c2f930d1d4e5b6
10 changes: 4 additions & 6 deletions src/Custom/RealtimeConversation/Internal/AsyncWebsocketMessageEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ internal partial class AsyncWebsocketMessageResultEnumerator : IAsyncEnumerator<
public ClientResult Current { get; private set; }
private readonly CancellationToken _cancellationToken;
private readonly WebSocket _webSocket;
private readonly byte[] _receiveBuffer;
private bool _disposed = false;
private byte[] _receiveBuffer;

public AsyncWebsocketMessageResultEnumerator(WebSocket webSocket, CancellationToken cancellationToken)
{
Expand All @@ -27,12 +26,11 @@ public AsyncWebsocketMessageResultEnumerator(WebSocket webSocket, CancellationTo

public ValueTask DisposeAsync()
{
if (!_disposed)
if (Interlocked.Exchange(ref _receiveBuffer, null) is byte[] toReturn)
{
ArrayPool<byte>.Shared.Return(_receiveBuffer);
_webSocket?.Dispose();
_disposed = true;
ArrayPool<byte>.Shared.Return(toReturn);
}
_webSocket?.Dispose();
return new ValueTask(Task.CompletedTask);
}

Expand Down