Imported Upstream version 5.8.0.22

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

View File

@@ -86,7 +86,7 @@ namespace System.ServiceModel.Discovery
if (!handle_announce_online)
return; // Offline announcement is done by another DiscoveryChannelDispatcher
DateTime start = DateTime.Now;
DateTime start = DateTime.UtcNow;
Communication.Open (timeout);
// and call AnnouncementOnline().
@@ -94,7 +94,7 @@ namespace System.ServiceModel.Discovery
// Published endpoints are added by DicoveryEndpointPublisherBehavior, which is added to each ServiceEndpoint in the primary (non-announcement) service.
if (dx != null) {
foreach (var edm in dx.PublishedEndpoints) {
client.InnerChannel.OperationTimeout = timeout - (DateTime.Now - start);
client.InnerChannel.OperationTimeout = timeout - (DateTime.UtcNow - start);
client.AnnounceOnline (edm);
}
}
@@ -115,19 +115,19 @@ namespace System.ServiceModel.Discovery
if (handle_announce_online)
return; // Offline announcement is done by another DiscoveryChannelDispatcher
DateTime start = DateTime.Now;
DateTime start = DateTime.UtcNow;
// and call AnnouncementOnline().
var dx = host.Extensions.Find<DiscoveryServiceExtension> ();
// Published endpoints are added by DicoveryEndpointPublisherBehavior, which is added to each ServiceEndpoint in the primary (non-announcement) service.
if (dx != null) {
foreach (var edm in dx.PublishedEndpoints) {
client.InnerChannel.OperationTimeout = timeout - (DateTime.Now - start);
client.InnerChannel.OperationTimeout = timeout - (DateTime.UtcNow - start);
client.AnnounceOffline (edm);
}
}
// Then close the client.
Communication.Close (timeout - (DateTime.Now - start));
Communication.Close (timeout - (DateTime.UtcNow - start));
}
protected override IAsyncResult OnBeginClose (TimeSpan timeout, AsyncCallback callback, object state)

View File

@@ -107,9 +107,9 @@ namespace System.ServiceModel.Discovery
protected override void OnOpen (TimeSpan timeout)
{
// FIXME: use timeout
DateTime start = DateTime.Now;
DateTime start = DateTime.UtcNow;
inner = CreateDiscoveryInnerChannel<TChannel> (factory);
((IChannel) inner).Open (timeout - (DateTime.Now - start));
((IChannel) inner).Open (timeout - (DateTime.UtcNow - start));
}
public Message Request (Message msg)