Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@ -455,8 +455,11 @@ namespace System.ServiceModel.Dispatcher
public void CloseInput ()
{
foreach (var ch in channels.ToArray ()) {
if (ch.State == CommunicationState.Closed)
RemoveChannel (ch);
if (ch.State == CommunicationState.Closed) {
lock (channels) {
RemoveChannel (ch);
}
}
else {
try {
ch.Close (close_timeout - (DateTime.Now - close_started));