Skip to content

Fix race in TransportBase.SetConnected #253

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
merged 2 commits into from
Apr 9, 2025
Merged

Fix race in TransportBase.SetConnected #253

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b29c06b
Fix race in TransportBase.SetConnected
halter73 Apr 9, 2025
27f88b9
Fix WriteMessageAsync IsConnected test
halter73 Apr 9, 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
10 changes: 5 additions & 5 deletions src/ModelContextProtocol/Protocol/Transport/TransportBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public abstract class TransportBase : ITransport
{
private readonly Channel<IJsonRpcMessage> _messageChannel;
private readonly ILogger _logger;
private bool _isConnected;
private int _isConnected;

/// <summary>
/// Initializes a new instance of the <see cref="TransportBase"/> class.
Expand All @@ -30,7 +30,7 @@ protected TransportBase(ILoggerFactory? loggerFactory)
}

/// <inheritdoc/>
public bool IsConnected => _isConnected;
public bool IsConnected => _isConnected == 1;

/// <inheritdoc/>
public ChannelReader<IJsonRpcMessage> MessageReader => _messageChannel.Reader;
Expand All @@ -48,7 +48,7 @@ protected TransportBase(ILoggerFactory? loggerFactory)
/// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
protected async Task WriteMessageAsync(IJsonRpcMessage message, CancellationToken cancellationToken = default)
{
if (!_isConnected)
if (!IsConnected)
{
throw new McpTransportException("Transport is not connected");
}
Expand All @@ -64,12 +64,12 @@ protected async Task WriteMessageAsync(IJsonRpcMessage message, CancellationToke
/// <param name="isConnected">Whether the transport is connected.</param>
protected void SetConnected(bool isConnected)
{
if (_isConnected == isConnected)
var newIsConnected = isConnected ? 1 : 0;
if (Interlocked.Exchange(ref _isConnected, newIsConnected) == newIsConnected)
{
return;
}

_isConnected = isConnected;
if (!isConnected)
{
_messageChannel.Writer.Complete();
Expand Down