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

Imported Upstream version 5.8.0.22

Browse Source 
Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mcs/class/System.ServiceModel/System.ServiceModel/ClientRuntimeChannel.cs
View File

@ -383,7 +383,6 @@ namespace System.ServiceModel.MonoInternal
protected override void OnClose (TimeSpan timeout)
{
DateTime start = DateTime.Now;
if (channel.State == CommunicationState.Opened)
channel.Close (timeout);
}
@ -593,9 +592,9 @@ namespace System.ServiceModel.MonoInternal
// FIXME: implement ConcurrencyMode check:
// if it is .Single && this instance for a callback channel && the operation is invoked inside service operation, then error.
DateTime startTime = DateTime.Now;
DateTime startTime = DateTime.UtcNow;
OutputChannel.Send (msg, timeout);
return ((IDuplexChannel) channel).Receive (timeout - (DateTime.Now - startTime));
return ((IDuplexChannel) channel).Receive (timeout - (DateTime.UtcNow - startTime));
}
internal IAsyncResult BeginRequest (Message msg, TimeSpan timeout, AsyncCallback callback, object state)

10
mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientRuntimeChannel.cs
View File

@ -115,12 +115,12 @@ namespace System.ServiceModel.MonoInternal
protected override void OnClose (TimeSpan timeout)
{
DateTime start = DateTime.Now;
DateTime start = DateTime.UtcNow;
base.OnClose (timeout);
loop = false;
if (!loop_handle.WaitOne (timeout - (DateTime.Now - start)))
if (!loop_handle.WaitOne (timeout - (DateTime.UtcNow - start)))
throw new TimeoutException ();
if (!finish_handle.WaitOne (timeout - (DateTime.Now - start)))
if (!finish_handle.WaitOne (timeout - (DateTime.UtcNow - start)))
throw new TimeoutException ();
}
@ -204,7 +204,7 @@ namespace System.ServiceModel.MonoInternal
internal override Message RequestCorrelated (Message msg, TimeSpan timeout, IOutputChannel channel)
{
DateTime startTime = DateTime.Now;
DateTime startTime = DateTime.UtcNow;
Message ret = null;
ManualResetEvent wait = new ManualResetEvent (false);
Action<Message> handler = delegate (Message reply) {
@ -213,7 +213,7 @@ namespace System.ServiceModel.MonoInternal
};
ReplyHandlerQueue.Enqueue (handler);
channel.Send (msg, timeout);
if (ret == null && !wait.WaitOne (timeout - (DateTime.Now - startTime)))
if (ret == null && !wait.WaitOne (timeout - (DateTime.UtcNow - startTime)))
throw new TimeoutException ();
return ret;
}

8
mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs
View File

@ -528,12 +528,12 @@ namespace System.ServiceModel
void OnCloseOrAbort (TimeSpan timeout)
{
DateTime start = DateTime.Now;
DateTime start = DateTime.UtcNow;
ReleasePerformanceCounters ();
List<ChannelDispatcherBase> l = new List<ChannelDispatcherBase> (ChannelDispatchers);
foreach (ChannelDispatcherBase e in l) {
try {
TimeSpan ts = timeout - (DateTime.Now - start);
TimeSpan ts = timeout - (DateTime.UtcNow - start);
if (ts < TimeSpan.Zero)
e.Abort ();
else
@ -547,7 +547,7 @@ namespace System.ServiceModel
protected override sealed void OnOpen (TimeSpan timeout)
{
DateTime start = DateTime.Now;
DateTime start = DateTime.UtcNow;
InitializeRuntime ();
for (int i = 0; i < ChannelDispatchers.Count; i++) {
// Skip ServiceMetadataExtension-based one. special case.
@ -567,7 +567,7 @@ namespace System.ServiceModel
var wait = new ManualResetEvent (false);
cd.Opened += delegate { wait.Set (); };
waits.Add (wait);
cd.Open (timeout - (DateTime.Now - start));
cd.Open (timeout - (DateTime.UtcNow - start));
}
WaitHandle.WaitAll (waits.ToArray ());