Skip to content
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

Allow ConnectionListener.AcceptAsync() to return null #41442

Merged
merged 2 commits into from
Aug 27, 2020
Merged

Allow ConnectionListener.AcceptAsync() to return null #41442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cdf21d
Allow return null from ConnectionListener.AcceptAsync
CarnaViire Aug 26, 2020
ce0bb7d
Merge remote-tracking branch 'upstream/master' into issue-41304-accep…
CarnaViire Aug 26, 2020
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
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Connections/ref/System.Net.Connections.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public abstract partial class ConnectionListener : System.IAsyncDisposable, Syst
protected ConnectionListener() { }
public abstract System.Net.Connections.IConnectionProperties ListenerProperties { get; }
public abstract System.Net.EndPoint? LocalEndPoint { get; }
public abstract System.Threading.Tasks.ValueTask<System.Net.Connections.Connection> AcceptAsync(System.Net.Connections.IConnectionProperties? options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
public abstract System.Threading.Tasks.ValueTask<System.Net.Connections.Connection?> AcceptAsync(System.Net.Connections.IConnectionProperties? options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
public void Dispose() { }
protected virtual void Dispose(bool disposing) { }
public System.Threading.Tasks.ValueTask DisposeAsync() { throw null; }
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Connections/src/System/Net/Connections/ConnectionListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public abstract class ConnectionListener : IAsyncDisposable, IDisposable
/// <param name="options">Options used to create the connection, if any.</param>
/// <param name="cancellationToken">A token used to cancel the asynchronous operation.</param>
/// <returns>A <see cref="ValueTask{TResult}"/> for the <see cref="Connection"/>.</returns>
public abstract ValueTask<Connection> AcceptAsync(IConnectionProperties? options = null, CancellationToken cancellationToken = default);
public abstract ValueTask<Connection?> AcceptAsync(IConnectionProperties? options = null, CancellationToken cancellationToken = default);

public void Dispose()
{
Expand Down