Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@ -53,6 +53,7 @@ namespace System.ServiceModel.Description
EndpointAddress address;
SMBinding binding;
MetadataExchangeClientMode mode = MetadataExchangeClientMode.MetadataExchange;
TimeSpan? operation_timeout = null;
// constructors
@ -88,7 +89,17 @@ namespace System.ServiceModel.Description
[MonoTODO]
public int MaximumResolvedReferences { get; set; }
public TimeSpan OperationTimeout { get; set; }
public TimeSpan OperationTimeout {
get {
if (!this.operation_timeout.HasValue) {
this.operation_timeout = DefaultCommunicationTimeouts.Instance.ReceiveTimeout;
}
return this.operation_timeout.Value;
}
set {
this.operation_timeout = value;
}
}
[MonoTODO]
public bool ResolveMetadataReferences { get; set; }