Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -201,13 +201,13 @@ namespace System.ServiceModel.Channels.NetTcp
if (accept_handles.Count > 0)
accept_handles [0].Set ();
}
} catch {
} catch (ObjectDisposedException) {
/* If an accept fails, just ignore it. Maybe the remote peer disconnected already */
} finally {
if (State == CommunicationState.Opened) {
try {
listener.BeginAcceptTcpClient (TcpListenerAcceptedClient, listener);
} catch {
} catch (ObjectDisposedException) {
/* If this fails, we must have disposed the listener */
}
}