mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.3.2.467

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

13
mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpReplyChannel.cs
View File

@ -92,8 +92,8 @@ namespace System.ServiceModel.Channels.Http
AbortConnections (timeout);
// FIXME: this wait is sort of hack (because it should not be required), but without it some tests are blocked.
// This hack even had better be moved to base.CancelAsync().
if (CurrentAsyncResult != null)
CurrentAsyncResult.AsyncWaitHandle.WaitOne (TimeSpan.FromMilliseconds (300));
// if (CurrentAsyncResult != null)
// CurrentAsyncResult.AsyncWaitHandle.WaitOne (TimeSpan.FromMilliseconds (300));
return base.CancelAsync (timeout);
}
@ -104,12 +104,15 @@ namespace System.ServiceModel.Channels.Http
}
bool close_started;
object close_lock = new object ();
protected override void OnClose (TimeSpan timeout)
{
if (close_started)
return;
close_started = true;
lock (close_lock) {
if (close_started)
return;
close_started = true;
}
DateTime start = DateTime.Now;
// FIXME: consider timeout