Skip to content

CSHARP-5725: C# driver stopped working with Unity since v3.2.0 #1793

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

CSHARP-5725: C# driver stopped working with Unity since v3.2.0 #1793

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 27 additions & 18 deletions src/MongoDB.Driver/Core/Connections/TcpStreamFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,31 +203,40 @@ private void Connect(Socket socket, EndPoint endPoint, CancellationToken cancell

private async Task ConnectAsync(Socket socket, EndPoint endPoint, CancellationToken cancellationToken)
{
var timeoutTask = Task.Delay(_settings.ConnectTimeout, cancellationToken);
var connectTask = socket.ConnectAsync(endPoint);
Task connectTask;

await Task.WhenAny(connectTask, timeoutTask).ConfigureAwait(false);

if (!connectTask.IsCompleted)
#if !NET472
connectTask = socket.ConnectAsync(endPoint);
#else
var dnsEndPoint = endPoint as DnsEndPoint;
if (dnsEndPoint != null)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor: (endPoints is DnsEndPoint dnsEndPoint)

{
try
{
socket.Dispose();
// should await on the read task to avoid UnobservedTaskException
await connectTask.ConfigureAwait(false);
} catch { }

cancellationToken.ThrowIfCancellationRequested();
throw new TimeoutException($"Timed out connecting to {endPoint}. Timeout was {_settings.ConnectTimeout}.");
// mono doesn't support DnsEndPoint in its BeginConnect method.
connectTask = Task.Factory.FromAsync(socket.BeginConnect(dnsEndPoint.Host, dnsEndPoint.Port, null, null), socket.EndConnect);
}

else
{
connectTask = Task.Factory.FromAsync(socket.BeginConnect(endPoint, null, null), socket.EndConnect);
}
#endif
try
{
await connectTask.ConfigureAwait(false);
await connectTask.WaitAsync(_settings.ConnectTimeout, cancellationToken).ConfigureAwait(false);
}
catch
catch (Exception ex)
{
try { socket.Dispose(); } catch { }
try
{
socket.Dispose();
connectTask.IgnoreExceptions();
}
catch { }

if (ex is TimeoutException)
{
throw new TimeoutException($"Timed out connecting to {endPoint}. Timeout was {_settings.ConnectTimeout}.");
}

throw;
}
}
Expand Down